diff --git a/src/locales/en.json b/src/locales/en.json
index 3ac969190..ed2d248e1 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1278,7 +1278,11 @@
"howCommunityElectionsWork": "How Community elections work",
"loremIpsumDolor":"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor",
"voteForYourself": "Vote for yourself",
- "reachConsensus": "Reach consensus"
+ "reachConsensus": "Reach consensus",
+ "thereAreThreeRounds": "There are three rounds and every participant has one vote. They can vote for themselves, as well. Votes can only be cast during the round and not after it ends.",
+ "thereAreThreeVoting": "There are three voting rounds and each one lasts 50 minutes. The entire process takes under 5 hours, making it quick and efficient.",
+ "ifYouNeedMore": "If you need more information please check Eden Community guidelines and informative material",
+ "visitEdenCommunity": "Visit Eden Community"
},
"home": {
"days": "days",
@@ -1653,6 +1657,10 @@
}
},
"upvote-election": {
+ "thisElectionProcessWillHelp": "This election process will help the community pick the best leaders to facilitate a better decision making process.",
+ "thereAreThreeRounds": "There are three rounds and every participant has one vote. They can vote for themselves, as well. Votes can only be cast during the round and not after it ends.",
+ "thereAreThreeVoting": "There are three voting rounds and each one lasts 50 minutes. The entire process takes under 5 hours, making it quick and efficient.",
+ "ifYouNeedMoreInformation": "If you need more information please check Eden Community guidelines and informative material",
"applications": "Applications",
"youCanViewTheMembersWho": "You can view the members who have signed up for the election below.",
"participants": "Participants",
diff --git a/src/locales/es.json b/src/locales/es.json
index 7c56af042..caf86f442 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -716,7 +716,8 @@
"proposals": "Propuestas",
"members": "miembros",
"organization": "Organización",
- "explore": "Explorar"
+ "explore": "Explorar",
+ "election": "Elección"
},
"navigation-header": {
"home": "Hogar",
@@ -1261,6 +1262,19 @@
"assignments": "Tareas",
"exportToCsv": "Exportar a csv"
},
+ "election": {
+ "participants": "Participantes",
+ "rounds": "Rondas",
+ "seeResults": "Ver resultados",
+ "howCommunityElectionsWork": "Cómo funcionan las elecciones comunitarias",
+ "loremIpsumDolor": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor",
+ "voteForYourself": "vota por ti mismo",
+ "reachConsensus": "Llegar a un consenso",
+ "thereAreThreeRounds": "Hay tres rondas y cada participante tiene un voto. ",
+ "thereAreThreeVoting": "Hay tres rondas de votación y cada una tiene una duración de 50 minutos. ",
+ "ifYouNeedMore": "Si necesita más información, consulte las pautas y el material informativo de Eden Community.",
+ "visitEdenCommunity": "Visita la comunidad del Edén"
+ },
"home": {
"days": "días",
"day": "día",
@@ -1631,11 +1645,46 @@
}
},
"upvote-election": {
+ "thisElectionProcessWillHelp": "Este proceso de elección ayudará a la comunidad a elegir a los mejores líderes para facilitar un mejor proceso de toma de decisiones.",
+ "thereAreThreeRounds": "Hay tres rondas y cada participante tiene un voto. ",
+ "thereAreThreeVoting": "Hay tres rondas de votación y cada una tiene una duración de 50 minutos. ",
+ "ifYouNeedMoreInformation": "Si necesita más información, consulte las pautas y el material informativo de Eden Community.",
"applications": "Aplicaciones",
- "youCanViewTheMembersWho": "Puede ver los miembros que se han registrado para la elección a continuación.",
+ "youCanViewTheMembersWho": "Puede ver los miembros que se han inscrito para la elección a continuación.",
"participants": "Participantes",
"treasury": "Tesorería",
"eachRound": "cada ronda",
+ "votingRound": "Ronda de votación",
+ "areYouReadyToBegin": "¿Estás listo para participar en el proceso de elección y conocer a los demás participantes? ",
+ "groups": "Grupos",
+ "l1DelegateBadges": "Insignias de delegado L1",
+ "l2DelegateBadges": "Insignias de delegado L2",
+ "memberSince": "Miembro desde {fecha}",
+ "group": "Grupo",
+ "finalVotingRound": "Ronda de votación final",
+ "youAreInTheFinalRound": "¡Estás en la ronda final! ",
+ "chiefDelegateBadges": "Insignias de Jefe de Delegado",
+ "headChiefDelegateBadge": "Insignia de jefe de delegación",
+ "headChiefDelegate": "Jefe delegado jefe",
+ "chiefDelegate": "Jefe delegado",
+ "results": "Resultados",
+ "seeAll": "Ver todo",
+ "levDelegateBadges": "Lev. ",
+ "loremIpsumDolor": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed",
+ "delegatel1": "Delegado Lev. ",
+ "delegatel2": "Delegado Lev. ",
+ "howCommunityElectionsWork": "Cómo funcionan las elecciones comunitarias",
+ "voting": "Votación",
+ "timing": "Momento",
+ "rules": "Normas",
+ "groupcard": {
+ "noRecordingsYet": "Aún no hay grabaciones",
+ "uploadRecording": "Subir grabación",
+ "slots": "Tragamonedas",
+ "consensus": "Consenso",
+ "votes": "Votos",
+ "vote": "Votar"
+ },
"upvoteelection": {
"timeLeft": "Tiempo restante:",
"days": "días",
@@ -1643,43 +1692,48 @@
"hours": "horas",
"hour": "hora",
"mins": "minutos",
- "min": "min",
+ "min": "mín.",
"secs": "segundos",
"sec": "segundo",
"castYourVote": "Emitir su voto",
"loremIpsumDolor": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed",
- "electionProcess": "Proceso de elección",
+ "electionProcess": "Proceso electoral",
"signUp": "Inscribirse",
- "signUpForThisElection": "Regístrese para esta elección",
- "telegramHandle": "identificador de telegrama",
+ "signUpForThisElection": "Regístrate para esta elección",
+ "telegramHandle": "Mango de telegrama",
"thanksForRegistering": "Gracias por registrarse para las elecciones.",
"theElectionIsAboutToStart": "Las elecciones están a punto de comenzar. ",
"learnMore": "Aprende más",
"left": "izquierda",
- "youCanVote": "Puede votar por un solo miembro en cada ronda. ",
- "toNextRound": "a la próxima ronda",
+ "youCanVote": "Puedes votar por un solo miembro en cada ronda. ",
+ "toNextRound": "a la siguiente ronda",
"wellDone": "¡Bien hecho! ",
"displacements": "Desplazamientos",
- "goToMyBadges": "Ir a mis insignias"
+ "goToMyBadges": "Ir a mis insignias",
+ "headChiefDelegate": "Jefe delegado jefe",
+ "chiefDelegate": "Jefe delegado",
+ "delegatel2": "Delegado Lev. ",
+ "delegatel1": "Delegado Lev. ",
+ "unsubscribe": "Darse de baja"
},
"steps": {
"stepround1": {
- "voterBadge": "Credencial de votante",
+ "voterBadge": "Insignia de votante",
"assigned": "Asignado:",
- "delegates": "delegados",
+ "delegates": "Delegados",
"applicants": "Solicitantes:",
"totalVoters": "Total de votantes:",
- "delegatesApplicants": "Delegados Solicitantes"
+ "delegatesApplicants": "Delegados Postulantes"
},
"stepheaddelegate": {
- "voterBadge": "Credencial de votante",
+ "voterBadge": "Insignia de votante",
"assigned": "Asignado:",
"memberInThisRound": "Miembro en esta ronda",
"totalVoters": "Total de votantes:",
"eligibleForChief": "Elegible para la insignia de Jefe de Delegado"
},
"stepchiefdelegates": {
- "voterBadge": "Credencial de votante",
+ "voterBadge": "Insignia de votante",
"assigned": "Asignado:",
"memberInThisRound": "Miembro en esta ronda",
"totalVoters": "Total de votantes:",
@@ -1687,13 +1741,13 @@
},
"stepresult": {
"totalVoters": "Total de votantes:",
- "totalDelegatesApplicants": "Total de delegados solicitantes:",
+ "totalDelegatesApplicants": "Total de delegados aspirantes:",
"round1Voters": "Votantes de la Ronda 1:",
"chiefDVoters": "Jefe D. Votantes:",
- "headDVoters": "Jefe D. Votantes:",
+ "headDVoters": "Jefe D. Electores:",
"headDelegate": "Jefe delegado",
- "HEADDELEGATE": "JEFE DELEGADO",
- "chiefDelegates": "Jefes delegados"
+ "HEADDELEGATE": "JEFE DE DELEGADO",
+ "chiefDelegates": "Jefes de delegación"
}
}
},
@@ -1826,7 +1880,8 @@
"configurationSettings": "Ajustes de configuración",
"ecosystemDashboard": "Panel de control del ecosistema",
"checkout": "Verificar",
- "upvoteElection": "Elección de voto a favor"
+ "upvoteElection": "Elección de voto a favor",
+ "election": "Elección"
},
"proposal-creation": {
"creation-process": "Proceso de creación",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index f30949298..b6a01b46f 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -716,7 +716,8 @@
"proposals": "제안",
"members": "회원",
"organization": "조직",
- "explore": "탐구하다"
+ "explore": "탐구하다",
+ "election": "선거"
},
"navigation-header": {
"home": "집",
@@ -1261,6 +1262,19 @@
"assignments": "과제",
"exportToCsv": "CSV로 내보내기"
},
+ "election": {
+ "participants": "참가자들",
+ "rounds": "라운드",
+ "seeResults": "결과 보기",
+ "howCommunityElectionsWork": "커뮤니티 선거 진행 방식",
+ "loremIpsumDolor": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor",
+ "voteForYourself": "스스로 투표하세요",
+ "reachConsensus": "합의에 도달",
+ "thereAreThreeRounds": "총 3개의 라운드가 진행되며 모든 참가자는 1개의 투표권을 가집니다. ",
+ "thereAreThreeVoting": "세 번의 투표가 있으며 각 라운드는 50분 동안 진행됩니다. ",
+ "ifYouNeedMore": "더 많은 정보가 필요하시면 Eden 커뮤니티 가이드라인과 정보자료를 확인해주세요",
+ "visitEdenCommunity": "에덴 커뮤니티를 방문해보세요"
+ },
"home": {
"days": "날",
"day": "낮",
@@ -1631,11 +1645,46 @@
}
},
"upvote-election": {
- "applications": "애플리케이션",
- "youCanViewTheMembersWho": "아래에서 선거에 등록한 구성원을 볼 수 있습니다.",
+ "thisElectionProcessWillHelp": "이 선거 과정은 커뮤니티가 더 나은 의사 결정 과정을 촉진하기 위해 최고의 지도자를 선택하는 데 도움이 될 것입니다.",
+ "thereAreThreeRounds": "총 3개의 라운드가 진행되며 모든 참가자는 1개의 투표권을 가집니다. ",
+ "thereAreThreeVoting": "세 번의 투표가 있으며 각 라운드는 50분 동안 진행됩니다. ",
+ "ifYouNeedMoreInformation": "더 많은 정보가 필요하시면 Eden 커뮤니티 가이드라인과 정보자료를 확인해주세요",
+ "applications": "응용",
+ "youCanViewTheMembersWho": "아래에서 선거에 응모한 회원을 확인하실 수 있습니다.",
"participants": "참가자들",
"treasury": "국고",
"eachRound": "각 라운드",
+ "votingRound": "투표 라운드",
+ "areYouReadyToBegin": "선거 과정에 참여하고 다른 참가자들을 알아갈 준비가 되셨나요? ",
+ "groups": "여러 떼",
+ "l1DelegateBadges": "L1 대표 배지",
+ "l2DelegateBadges": "L2 대표 배지",
+ "memberSince": "{날짜} 이후 회원",
+ "group": "그룹",
+ "finalVotingRound": "최종 투표 라운드",
+ "youAreInTheFinalRound": "당신은 마지막 라운드에 있습니다! ",
+ "chiefDelegateBadges": "최고 대표 배지",
+ "headChiefDelegateBadge": "수석 대표단 배지",
+ "headChiefDelegate": "수석대표",
+ "chiefDelegate": "수석대표",
+ "results": "결과",
+ "seeAll": "모두 보기",
+ "levDelegateBadges": "레프. ",
+ "loremIpsumDolor": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed",
+ "delegatel1": "레프 대표. ",
+ "delegatel2": "레프 대표. ",
+ "howCommunityElectionsWork": "커뮤니티 선거 진행 방식",
+ "voting": "투표",
+ "timing": "타이밍",
+ "rules": "규칙",
+ "groupcard": {
+ "noRecordingsYet": "아직 녹음된 내용이 없습니다.",
+ "uploadRecording": "녹음 업로드",
+ "slots": "슬롯",
+ "consensus": "의견 일치",
+ "votes": "투표",
+ "vote": "투표"
+ },
"upvoteelection": {
"timeLeft": "남은 시간:",
"days": "날",
@@ -1651,49 +1700,54 @@
"electionProcess": "선거 과정",
"signUp": "가입하기",
"signUpForThisElection": "이번 선거에 등록하세요",
- "telegramHandle": "전보 핸들",
- "thanksForRegistering": "선거에 등록해 주셔서 감사합니다.",
+ "telegramHandle": "텔레그램 핸들",
+ "thanksForRegistering": "선거에 등록해주셔서 감사합니다",
"theElectionIsAboutToStart": "선거가 곧 시작됩니다. ",
"learnMore": "더 알아보기",
"left": "왼쪽",
- "youCanVote": "각 라운드에서 한 명의 회원에게만 투표할 수 있습니다. ",
+ "youCanVote": "각 라운드마다 한 명의 회원에게만 투표할 수 있습니다. ",
"toNextRound": "다음 라운드로",
"wellDone": "잘하셨어요! ",
"displacements": "변위",
- "goToMyBadges": "내 배지로 이동"
+ "goToMyBadges": "내 배지로 이동",
+ "headChiefDelegate": "수석대표",
+ "chiefDelegate": "수석대표",
+ "delegatel2": "레프 대표. ",
+ "delegatel1": "레프 대표. ",
+ "unsubscribe": "구독 취소"
},
"steps": {
"stepround1": {
"voterBadge": "유권자 배지",
"assigned": "할당된:",
- "delegates": "대의원",
+ "delegates": "대표자",
"applicants": "지원자:",
"totalVoters": "총 유권자 수:",
- "delegatesApplicants": "대의원 지원자"
+ "delegatesApplicants": "대리 지원자"
},
"stepheaddelegate": {
"voterBadge": "유권자 배지",
"assigned": "할당된:",
- "memberInThisRound": "이번 라운드의 멤버",
+ "memberInThisRound": "이번 라운드의 회원",
"totalVoters": "총 유권자 수:",
- "eligibleForChief": "수석대표 배지 획득 가능"
+ "eligibleForChief": "수석 대표 배지 획득 가능"
},
"stepchiefdelegates": {
"voterBadge": "유권자 배지",
"assigned": "할당된:",
- "memberInThisRound": "이번 라운드의 멤버",
+ "memberInThisRound": "이번 라운드의 회원",
"totalVoters": "총 유권자 수:",
- "eligibleForChief": "수석대표 배지 획득 가능"
+ "eligibleForChief": "수석 대표 배지 획득 가능"
},
"stepresult": {
"totalVoters": "총 유권자 수:",
- "totalDelegatesApplicants": "총 대의원 지원자:",
- "round1Voters": "1라운드 유권자:",
- "chiefDVoters": "D. 유권자:",
- "headDVoters": "헤드 D. 유권자:",
- "headDelegate": "수석대표",
- "HEADDELEGATE": "대표단",
- "chiefDelegates": "수석대표"
+ "totalDelegatesApplicants": "총 대표자 지원자 수:",
+ "round1Voters": "1차 투표자:",
+ "chiefDVoters": "D. 수석 유권자:",
+ "headDVoters": "D. 유권자:",
+ "headDelegate": "수석 대표",
+ "HEADDELEGATE": "수석대표",
+ "chiefDelegates": "최고대표"
}
}
},
@@ -1826,7 +1880,8 @@
"configurationSettings": "구성 설정",
"ecosystemDashboard": "생태계 대시보드",
"checkout": "점검",
- "upvoteElection": "찬성 선거"
+ "upvoteElection": "찬성 선거",
+ "election": "선거"
},
"proposal-creation": {
"creation-process": "생성 과정",
diff --git a/src/locales/pt.json b/src/locales/pt.json
index 9e978afdd..08daebc83 100644
--- a/src/locales/pt.json
+++ b/src/locales/pt.json
@@ -716,7 +716,8 @@
"proposals": "Propostas",
"members": "Membros",
"organization": "Organização",
- "explore": "Explorar"
+ "explore": "Explorar",
+ "election": "Eleição"
},
"navigation-header": {
"home": "Lar",
@@ -1261,6 +1262,19 @@
"assignments": "atribuições",
"exportToCsv": "Exportar para csv"
},
+ "election": {
+ "participants": "Participantes",
+ "rounds": "Rodadas",
+ "seeResults": "Ver resultados",
+ "howCommunityElectionsWork": "Como funcionam as eleições comunitárias",
+ "loremIpsumDolor": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor",
+ "voteForYourself": "Vote em você mesmo",
+ "reachConsensus": "Alcançar consenso",
+ "thereAreThreeRounds": "São três rodadas e cada participante tem um voto. ",
+ "thereAreThreeVoting": "São três rodadas de votação e cada uma dura 50 minutos. ",
+ "ifYouNeedMore": "Se precisar de mais informações, consulte as diretrizes da Comunidade Eden e o material informativo",
+ "visitEdenCommunity": "Visite a Comunidade Éden"
+ },
"home": {
"days": "dias",
"day": "dia",
@@ -1631,11 +1645,46 @@
}
},
"upvote-election": {
+ "thisElectionProcessWillHelp": "Este processo eleitoral ajudará a comunidade a escolher os melhores líderes para facilitar um melhor processo de tomada de decisão.",
+ "thereAreThreeRounds": "São três rodadas e cada participante tem um voto. ",
+ "thereAreThreeVoting": "São três rodadas de votação e cada uma dura 50 minutos. ",
+ "ifYouNeedMoreInformation": "Se precisar de mais informações, consulte as diretrizes da Comunidade Eden e o material informativo",
"applications": "Formulários",
"youCanViewTheMembersWho": "Você pode ver os membros que se inscreveram para a eleição abaixo.",
- "participants": "participantes",
+ "participants": "Participantes",
"treasury": "Tesouraria",
"eachRound": "Cada rodada",
+ "votingRound": "Rodada de votação",
+ "areYouReadyToBegin": "Você está pronto para iniciar o processo eleitoral e conhecer os demais participantes? ",
+ "groups": "Grupos",
+ "l1DelegateBadges": "Crachás de Delegado L1",
+ "l2DelegateBadges": "Crachás de Delegado L2",
+ "memberSince": "Membro desde {date}",
+ "group": "Grupo",
+ "finalVotingRound": "Rodada de votação final",
+ "youAreInTheFinalRound": "Você está na rodada final! ",
+ "chiefDelegateBadges": "Crachás de Delegado Chefe",
+ "headChiefDelegateBadge": "Distintivo de Delegado Chefe Chefe",
+ "headChiefDelegate": "Delegado Chefe Chefe",
+ "chiefDelegate": "Delegado Chefe",
+ "results": "Resultados",
+ "seeAll": "Ver tudo",
+ "levDelegateBadges": "Lev. ",
+ "loremIpsumDolor": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed",
+ "delegatel1": "Delegado Lev. ",
+ "delegatel2": "Delegado Lev. ",
+ "howCommunityElectionsWork": "Como funcionam as eleições comunitárias",
+ "voting": "Votação",
+ "timing": "Tempo",
+ "rules": "Regras",
+ "groupcard": {
+ "noRecordingsYet": "Ainda não há gravações",
+ "uploadRecording": "Carregar gravação",
+ "slots": "Caça-níqueis",
+ "consensus": "Consenso",
+ "votes": "Votos",
+ "vote": "Voto"
+ },
"upvoteelection": {
"timeLeft": "Tempo restante:",
"days": "dias",
@@ -1648,10 +1697,10 @@
"sec": "segundo",
"castYourVote": "Dê seu voto",
"loremIpsumDolor": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed",
- "electionProcess": "processo eleitoral",
+ "electionProcess": "Processo eleitoral",
"signUp": "Inscrever-se",
- "signUpForThisElection": "Inscreva-se para esta eleição",
- "telegramHandle": "identificador de telegrama",
+ "signUpForThisElection": "Inscreva-se nesta eleição",
+ "telegramHandle": "Identificador de telegrama",
"thanksForRegistering": "Obrigado por se registrar para a eleição",
"theElectionIsAboutToStart": "A eleição está prestes a começar. ",
"learnMore": "Saber mais",
@@ -1660,38 +1709,43 @@
"toNextRound": "para a próxima rodada",
"wellDone": "Bom trabalho! ",
"displacements": "Deslocamentos",
- "goToMyBadges": "Ir para meus emblemas"
+ "goToMyBadges": "Ir para meus emblemas",
+ "headChiefDelegate": "Delegado Chefe Chefe",
+ "chiefDelegate": "Delegado Chefe",
+ "delegatel2": "Delegado Lev. ",
+ "delegatel1": "Delegado Lev. ",
+ "unsubscribe": "Cancelar subscrição"
},
"steps": {
"stepround1": {
- "voterBadge": "crachá de eleitor",
+ "voterBadge": "Crachá de eleitor",
"assigned": "Atribuído:",
"delegates": "Delegados",
"applicants": "Candidatos:",
- "totalVoters": "Total de votantes:",
- "delegatesApplicants": "Candidatos a Delegados"
+ "totalVoters": "Total de eleitores:",
+ "delegatesApplicants": "Delegados Candidatos"
},
"stepheaddelegate": {
- "voterBadge": "crachá de eleitor",
+ "voterBadge": "Crachá de eleitor",
"assigned": "Atribuído:",
"memberInThisRound": "Membro nesta rodada",
- "totalVoters": "Total de votantes:",
- "eligibleForChief": "Elegível para o distintivo de Delegado Chefe"
+ "totalVoters": "Total de eleitores:",
+ "eligibleForChief": "Elegível para o crachá de Delegado Chefe"
},
"stepchiefdelegates": {
- "voterBadge": "crachá de eleitor",
+ "voterBadge": "Crachá de eleitor",
"assigned": "Atribuído:",
"memberInThisRound": "Membro nesta rodada",
- "totalVoters": "Total de votantes:",
- "eligibleForChief": "Elegível para o distintivo de Delegado Chefe"
+ "totalVoters": "Total de eleitores:",
+ "eligibleForChief": "Elegível para o crachá de Delegado Chefe"
},
"stepresult": {
- "totalVoters": "Total de votantes:",
- "totalDelegatesApplicants": "Total de candidatos a delegados:",
- "round1Voters": "Eleitores do 1º turno:",
+ "totalVoters": "Total de eleitores:",
+ "totalDelegatesApplicants": "Total de delegados candidatos:",
+ "round1Voters": "Eleitores da primeira rodada:",
"chiefDVoters": "Chefe D. Eleitores:",
- "headDVoters": "Head D. Eleitores:",
- "headDelegate": "Chefe Delegado",
+ "headDVoters": "Chefe D. Eleitores:",
+ "headDelegate": "Delegado Chefe",
"HEADDELEGATE": "DELEGADO CHEFE",
"chiefDelegates": "Delegados Chefes"
}
@@ -1826,7 +1880,8 @@
"configurationSettings": "Definições de configuração",
"ecosystemDashboard": "Painel do Ecossistema",
"checkout": "Confira",
- "upvoteElection": "Votar a favor da eleição"
+ "upvoteElection": "Votar a favor da eleição",
+ "election": "Eleição"
},
"proposal-creation": {
"creation-process": "processo de criação",
diff --git a/src/locales/sr.json b/src/locales/sr.json
index 85bfb0606..5b1d6fe36 100644
--- a/src/locales/sr.json
+++ b/src/locales/sr.json
@@ -716,7 +716,8 @@
"proposals": "Предлози",
"members": "Чланови",
"organization": "Организација",
- "explore": "Истражите"
+ "explore": "Истражите",
+ "election": "Избори"
},
"navigation-header": {
"home": "Кућа",
@@ -1261,6 +1262,19 @@
"assignments": "Задаци",
"exportToCsv": "Извези у цсв"
},
+ "election": {
+ "participants": "Учесници",
+ "rounds": "Роундс",
+ "seeResults": "Погледајте резултате",
+ "howCommunityElectionsWork": "Како функционишу избори у заједници",
+ "loremIpsumDolor": "Лорем ипсум долор сит амет, цонсецтетур адиписцинг елит, сед до еиусмод темпор",
+ "voteForYourself": "Гласајте за себе",
+ "reachConsensus": "Постигните консензус",
+ "thereAreThreeRounds": "Постоје три круга и сваки учесник има један глас. ",
+ "thereAreThreeVoting": "Постоје три круга гласања и сваки траје 50 минута. ",
+ "ifYouNeedMore": "Ако вам треба више информација, погледајте Еден смернице заједнице и информативни материјал",
+ "visitEdenCommunity": "Посетите Еден заједницу"
+ },
"home": {
"days": "дана",
"day": "дан",
@@ -1631,11 +1645,46 @@
}
},
"upvote-election": {
+ "thisElectionProcessWillHelp": "Овај изборни процес ће помоћи заједници да изабере најбоље лидере како би олакшали бољи процес доношења одлука.",
+ "thereAreThreeRounds": "Постоје три круга и сваки учесник има један глас. ",
+ "thereAreThreeVoting": "Постоје три круга гласања и сваки траје 50 минута. ",
+ "ifYouNeedMoreInformation": "Ако вам треба више информација, погледајте Еден смернице заједнице и информативни материјал",
"applications": "Апликације",
"youCanViewTheMembersWho": "У наставку можете погледати чланове који су се пријавили за изборе.",
"participants": "Учесници",
"treasury": "Треасури",
"eachRound": "Сваки круг",
+ "votingRound": "Вотинг Роунд",
+ "areYouReadyToBegin": "Да ли сте спремни да будете у изборном процесу и да упознате остале учеснике? ",
+ "groups": "Групе",
+ "l1DelegateBadges": "Значке делегата Л1",
+ "l2DelegateBadges": "Значке делегата Л2",
+ "memberSince": "Члан од {дате}",
+ "group": "Група",
+ "finalVotingRound": "Финални круг гласања",
+ "youAreInTheFinalRound": "Ти си у последњој рунди! ",
+ "chiefDelegateBadges": "Значке главног делегата",
+ "headChiefDelegateBadge": "Значка главног главног делегата",
+ "headChiefDelegate": "Главни главни делегат",
+ "chiefDelegate": "Главни делегат",
+ "results": "Резултати",
+ "seeAll": "Видети све",
+ "levDelegateBadges": "Лев. ",
+ "loremIpsumDolor": "Лорем ипсум долор сит амет, цонсецтетур адиписцинг елит, сед",
+ "delegatel1": "Делегат Лев. ",
+ "delegatel2": "Делегат Лев. ",
+ "howCommunityElectionsWork": "Како функционишу избори у заједници",
+ "voting": "Гласање",
+ "timing": "Тајминг",
+ "rules": "Правила",
+ "groupcard": {
+ "noRecordingsYet": "Још нема снимака",
+ "uploadRecording": "Отпремите снимак",
+ "slots": "Слотс",
+ "consensus": "Консензус",
+ "votes": "Гласови",
+ "vote": "Гласајте"
+ },
"upvoteelection": {
"timeLeft": "Преостало време:",
"days": "дана",
@@ -1660,7 +1709,12 @@
"toNextRound": "у следећу рунду",
"wellDone": "Добро урађено! ",
"displacements": "Дисплацементс",
- "goToMyBadges": "Иди на моје значке"
+ "goToMyBadges": "Иди на моје значке",
+ "headChiefDelegate": "Главни главни делегат",
+ "chiefDelegate": "Главни делегат",
+ "delegatel2": "Делегат Лев. ",
+ "delegatel1": "Делегат Лев. ",
+ "unsubscribe": "Откажи претплату"
},
"steps": {
"stepround1": {
@@ -1826,7 +1880,8 @@
"configurationSettings": "Подешавања конфигурације",
"ecosystemDashboard": "Контролна табла екосистема",
"checkout": "Провери",
- "upvoteElection": "Избори за гласање"
+ "upvoteElection": "Избори за гласање",
+ "election": "Избори"
},
"proposal-creation": {
"creation-process": "Процес стварања",
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 5ce81cb99..d6d554416 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -716,7 +716,8 @@
"proposals": "提案",
"members": "会员",
"organization": "组织",
- "explore": "探索"
+ "explore": "探索",
+ "election": "选举"
},
"navigation-header": {
"home": "家",
@@ -1261,6 +1262,19 @@
"assignments": "作业",
"exportToCsv": "导出为 csv"
},
+ "election": {
+ "participants": "参加者",
+ "rounds": "回合",
+ "seeResults": "查看结果",
+ "howCommunityElectionsWork": "社区选举如何运作",
+ "loremIpsumDolor": "Lorem ipsum dolor sat amet、consectetur adipiscing elit、sed do eiusmod tempor",
+ "voteForYourself": "为自己投票",
+ "reachConsensus": "达成共识",
+ "thereAreThreeRounds": "共有三轮,每位参赛者有一票。",
+ "thereAreThreeVoting": "投票分为三轮,每轮持续 50 分钟。",
+ "ifYouNeedMore": "如果您需要更多信息,请查看 Eden 社区指南和信息材料",
+ "visitEdenCommunity": "参观伊甸园社区"
+ },
"home": {
"days": "天",
"day": "天",
@@ -1631,11 +1645,46 @@
}
},
"upvote-election": {
+ "thisElectionProcessWillHelp": "这一选举过程将帮助社区选出最好的领导者,以促进更好的决策过程。",
+ "thereAreThreeRounds": "共有三轮,每位参赛者有一票。",
+ "thereAreThreeVoting": "投票分为三轮,每轮持续 50 分钟。",
+ "ifYouNeedMoreInformation": "如果您需要更多信息,请查看 Eden 社区指南和信息材料",
"applications": "应用领域",
"youCanViewTheMembersWho": "您可以在下面查看已报名参加选举的会员。",
"participants": "参加者",
"treasury": "财政部",
"eachRound": "每轮",
+ "votingRound": "投票轮",
+ "areYouReadyToBegin": "您准备好参加选举并结识其他参与者了吗?",
+ "groups": "团体",
+ "l1DelegateBadges": "L1 代表徽章",
+ "l2DelegateBadges": "L2 代表徽章",
+ "memberSince": "自 {date} 起成为会员",
+ "group": "团体",
+ "finalVotingRound": "最后一轮投票",
+ "youAreInTheFinalRound": "你已经进入最后一轮了!",
+ "chiefDelegateBadges": "首席代表徽章",
+ "headChiefDelegateBadge": "首席代表徽章",
+ "headChiefDelegate": "首席代表",
+ "chiefDelegate": "首席代表",
+ "results": "结果",
+ "seeAll": "查看全部",
+ "levDelegateBadges": "列弗。 ",
+ "loremIpsumDolor": "Lorem ipsum dolor sat amet、consectetur adipiscing elit、sed",
+ "delegatel1": "代表列夫。 ",
+ "delegatel2": "代表列夫。 ",
+ "howCommunityElectionsWork": "社区选举如何运作",
+ "voting": "表决",
+ "timing": "定时",
+ "rules": "规则",
+ "groupcard": {
+ "noRecordingsYet": "还没有录音",
+ "uploadRecording": "上传录音",
+ "slots": "老虎机",
+ "consensus": "共识",
+ "votes": "投票数",
+ "vote": "投票"
+ },
"upvoteelection": {
"timeLeft": "剩余时间:",
"days": "天",
@@ -1660,7 +1709,12 @@
"toNextRound": "到下一轮",
"wellDone": "做得好!",
"displacements": "位移",
- "goToMyBadges": "转到我的徽章"
+ "goToMyBadges": "转到我的徽章",
+ "headChiefDelegate": "首席代表",
+ "chiefDelegate": "首席代表",
+ "delegatel2": "代表列夫。 ",
+ "delegatel1": "代表列夫。 ",
+ "unsubscribe": "退订"
},
"steps": {
"stepround1": {
@@ -1826,7 +1880,8 @@
"configurationSettings": "配置设置",
"ecosystemDashboard": "生态系统仪表板",
"checkout": "查看",
- "upvoteElection": "投票支持选举"
+ "upvoteElection": "投票支持选举",
+ "election": "选举"
},
"proposal-creation": {
"creation-process": "创作过程",
diff --git a/src/pages/dho/Election.vue b/src/pages/dho/Election.vue
index 4601801a0..ad7d8237b 100644
--- a/src/pages/dho/Election.vue
+++ b/src/pages/dho/Election.vue
@@ -23,6 +23,9 @@ getDao(docId: $daoId) {
ueRdMemberAggregate {
count
}
+ ueRdMember {
+ details_member_n
+ }
}
}
}
@@ -53,7 +56,8 @@ export default {
components: {
BaseBanner: () => import('~/components/common/base-banner.vue'),
- Widget: () => import('~/components/common/widget.vue')
+ Widget: () => import('~/components/common/widget.vue'),
+ LoadingSpinner: () => import('~/components/common/loading-spinner.vue')
},
apollo: {
@@ -64,7 +68,7 @@ export default {
delegatesList: data.getDao.delegate,
endDate: election.details_endDate_t,
rounds: election.ueRound.length,
- participants: election.ueStartrnd[0].ueGroupLnk.reduce((sum, group) => sum + group.ueRdMemberAggregate.count, 0),
+ participants: election.ueStartrnd.reduce((count, group) => count + group.ueGroupLnk.reduce((count, link) => count + link.ueRdMember.filter(member => member.details_member_n).length, 0), 0),
id: election.docId
}
}),
@@ -110,9 +114,7 @@ export default {
dateToStringShort,
timeRemaining: {},
counterdown: undefined,
- treasury: 1200000,
isUpVoteElectionBannerVisible: true,
- endDate: '2023-08-23',
slide: '1',
titles: [
this.$t('pages.dho.election.howCommunityElectionsWork'),
@@ -197,7 +199,7 @@ export default {
// if (!this.upvoteElection) return 0
// const end = this.upvoteElection?.upcomingElection?.length ? new Date(this.upvoteElection?.startTime) : new Date(this.upvoteElection?.endTime)
- const end = new Date(this.endDate)
+ const end = new Date(this.upcomingElection?.details_startDate_t)
const now = Date.now()
const t = end - now
// if (t < 0) {
@@ -215,8 +217,8 @@ export default {
q-page.page-election
- base-banner.q-mb-md(v-bind="upvoteElectionBanner" @onClose="hideUpvoteBanner" upvoteBanner :background="require('~/assets/images/election-banner-bg.jpeg')" v-if="isUpVoteElectionBannerVisible && !ongoingElection?.length")
- template(v-if="!hasNextElection" v-slot:right)
+ base-banner.q-mb-md(v-bind="upvoteElectionBanner" @onClose="hideUpvoteBanner" upvoteBanner :background="require('~/assets/images/election-banner-bg.jpeg')" v-if="isUpVoteElectionBannerVisible && upcomingElection")
+ template(v-if="hasNextElection" v-slot:right)
.flex.full-width.full-height.items-center.justify-center
q-card.q-pa-xl(:style="{ 'width': '350px', 'opacity': '.7', 'border-radius': '15px' }")
.col
@@ -249,13 +251,12 @@ q-page.page-election
//- .col.flex.justify-center
.h-h6 $ {{ formatNumber(treasury) }}
.full-width.flex.justify-center.text-secondary {{ $t('pages.dho.home.treasury') }}
- template(v-if="!hasNextElection" v-slot:buttons)
+ template(v-if="hasNextElection" v-slot:buttons)
.row.justify-start
.flex(:class=" { 'q-mt-md': $q.screen.lt.md, 'justify-end': $q.screen.gt.sm }")
- router-link(:to="{ name: 'upvote-election' }")
- q-btn.q-px-lg.h-btn1(:disable="!ongoingElection.length" :class="{ 'q-mt-sm': $q.screen.lt.xs || $q.screen.xs }" no-caps rounded unelevated :label="$t('pages.dho.home.signup')" color="secondary" text-color="white")
- q-btn.q-px-lg.h-btn1.q-ml-sm(color="white" flat :label="$t('pages.dho.home.learnMore')" no-caps rounded)
- template(v-else="hasNextElection" v-slot:buttons)
+ q-btn.q-px-lg.h-btn1(@click="$router.push({ path: `/${selectedDao.name}/election/${upcomingElection.docId}` })" :disable="!upcomingElection" :class="{ 'q-mt-sm': $q.screen.lt.xs || $q.screen.xs }" no-caps rounded unelevated :label="$t('pages.dho.home.signup')" color="secondary" text-color="white")
+ q-btn.q-px-lg.h-btn1.q-ml-sm(color="white" flat :label="$t('pages.dho.home.learnMore')" no-caps rounded)
+ template(v-else="!hasNextElection" v-slot:buttons)
.row.justify-start
q-btn.q-px-lg.h-btn1(disable :class="{ 'q-mt-sm': $q.screen.lt.xs || $q.screen.xs }" no-caps rounded unelevated :label="$t('pages.dho.home.nextElection', { date: dateToStringShort(nextElectionStartDate) })" color="white" text-color="primary")
.row
@@ -268,15 +269,15 @@ q-page.page-election
.col.flex.justify-center.text-black(:style="{ 'font-size': '17px' }")
div {{ election.rounds }} {{ $t('pages.dho.election.rounds') }}
.col.flex.justify-center.text-black(:style="{ 'font-size': '17px' }")
- div {{ election.delegatesList.length }} {{ $t('pages.dho.election.participants') }}
+ div {{ election.participants }} {{ $t('pages.dho.election.participants') }}
.col.flex.justify-end
q-btn.q-px-lg.h-btn1(@click="$router.push({ path: `/${selectedDao.name}/election/${election.id}` })" :class="{ 'q-mt-sm': $q.screen.lt.xs || $q.screen.xs }" no-caps rounded unelevated :label="$t('pages.dho.election.seeResults')" color="primary" text-color="white")
.col
widget(:title="widgetTitle")
q-carousel.b2.q-mt-md(v-model="slide" swipeable="swipeable" animated="animated" navigation="navigation" :padding="false" height="240px" control-color="primary" ref="carousel")
q-carousel-slide.no-padding(name="1")
- .h-b2 {{ $t('pages.dho.election.loremIpsumDolor') }}
- .col.text-black.text-bold.q-my-md(:style="{ 'font-weight': '600' }")
+ .h-b2 {{ $t('pages.dho.election.thereAreThreeRounds') }}
+ .col.text-black.text-bold.q-my-xxs(:style="{ 'font-weight': '600' }")
.row.q-mb-md.flex.justify-between.items-center
div {{ $t('pages.dho.election.voteForYourself') }}
q-icon(name="fas fa-check" color="positive" size="20px")
@@ -284,9 +285,11 @@ q-page.page-election
div {{ $t('pages.dho.election.reachConsensus') }}
q-icon(name="fas fa-check" color="positive" size="20px")
q-carousel-slide.no-padding(name="2")
- .h-b2 {{ $t('pages.dho.election.loremIpsumDolor') }}
+ .h-b2 {{ $t('pages.dho.election.thereAreThreeVoting') }}
q-carousel-slide.no-padding(name="3")
- .h-b2 {{ $t('pages.dho.election.loremIpsumDolor') }}
+ .h-b2 {{ $t('pages.dho.election.ifYouNeedMore') }}
+ .row.flex.justify-end.q-mt-lg
+ q-btn.h-btn1.q-px-sm(:color="'secondary'" no-caps rounded unelevated) {{ $t('pages.dho.election.visitEdenCommunity') }}
template(v-slot:control)
q-carousel-control(position="bottom-right")
q-btn.q-mt-md.round-circle(flat unelevated padding="13px" icon="fas fa-chevron-right" size="xxs" color="primary" @click="$refs.carousel.next()")
diff --git a/src/pages/upvote-election/GroupCard.vue b/src/pages/upvote-election/GroupCard.vue
index 17b39e740..7a6fc84ed 100644
--- a/src/pages/upvote-election/GroupCard.vue
+++ b/src/pages/upvote-election/GroupCard.vue
@@ -13,7 +13,9 @@ export default {
votes: Array,
electionStatus: String,
roundId: String,
- groupId: String
+ groupId: String,
+ winner: String,
+ roundNumber: Number
},
data () {
@@ -22,22 +24,7 @@ export default {
}
},
- apollo: {
- member: {
- query: require('~/query/profile/profile-basic-info.gql'),
- update: data => {
- return data.getMember
- },
- variables () {
- return {
- username: this.account
- }
- },
- skip () {
- return !this.account
- }
- }
- },
+ apollo: {},
computed: {
...mapGetters('accounts', ['account'])
@@ -72,14 +59,18 @@ export default {
div(v-if="!users.find(user => user.details_member_n === account && electionStatus !== 'finished')") {{ $t('pages.upvote-election.groupcard.noRecordingsYet') }}
.text-secondary.cursor-pointer.text-underline(v-else) {{ $t('pages.upvote-election.groupcard.uploadRecording') }}
template(v-for="user in users")
- profile-picture.q-mr-xxs(:username="user.details_member_n" size="24px" :key="applicant")
+ div(:style="'position: relative;'")
+ profile-picture.q-mr-xxs(:username="user.details_member_n" size="24px" :key="user.details_member_n")
+ img.absolute(v-if="user.details_member_n === winner && roundNumber === 1" width="18px" height="18px" :style="'top: 14px; left: 12px;'" src="~/assets/icons/delegate-l1.svg")
+ img.absolute(v-if="user.details_member_n === winner && roundNumber === 2" width="18px" height="18px" :style="'top: 14px; left: 12px;'" src="~/assets/icons/delegate-l2.svg")
+ img.absolute(v-if="user.details_member_n === winner && roundNumber === 3" width="18px" height="18px" :style="'top: 14px; left: 12px;'" src="~/assets/icons/chief-delegate.svg")
q-btn(@click="showUsers = !showUsers" flat rounded :icon="showUsers ? 'fas fa-chevron-up' : 'fas fa-chevron-down'")
q-slide-transition
div.q-mt-xl.q-pt-xl(v-show="showUsers" :style="{ 'border-top': '1px solid #CBCDD1'}")
template(v-for="user in users")
.row.flex.items-center.q-mb-md
.col-1.q-mr-xs.flex.items-center
- profile-picture(:username="user.details_member_n" size="24px" :key="applicant")
+ profile-picture(:username="user.details_member_n" size="24px" :key="user.details_member_n")
.col
.row.text-bold.text-black {{ user.details_member_n }}
.row(:style="{ 'font-size': '10px' }") {{ user.telegram }}
diff --git a/src/pages/upvote-election/RoundCard.vue b/src/pages/upvote-election/RoundCard.vue
index b9a0b9701..dc7c05a78 100644
--- a/src/pages/upvote-election/RoundCard.vue
+++ b/src/pages/upvote-election/RoundCard.vue
@@ -93,7 +93,7 @@ export default {
div.q-my-xl.q-pt-xl(v-show="showGroups" :style="{ 'border-top': '1px solid #CBCDD1'}")
.row.q-gutter-col-md
template(v-for="group, index in groups")
- group-card.col-6.q-pa-xxs(:groupId="group.id" :roundId="id" :electionStatus="electionStatus" :users="group.members" :groupNumber="index + 1" :votes="group.votes")
+ group-card.col-6.q-pa-xxs(:roundNumber="roundNumber" :winner="group.winner" :groupId="group.id" :roundId="id" :electionStatus="electionStatus" :users="group.members" :groupNumber="index + 1" :votes="group.votes")