ricola/vedia
0
0
Fork 0
Code Issues 18 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: ricola:7f6743d13d0a5fa30ab1feaf2d71534e4d886f04
Branches Tags
ricola:main
..
compare: ricola:4c13fb53d22aca4641b101ea268f97278b045ee9
Branches Tags
ricola:main

No commits in common. "7f6743d13d0a5fa30ab1feaf2d71534e4d886f04" and "4c13fb53d22aca4641b101ea268f97278b045ee9" have entirely different histories.
7f6743d13d ... 4c13fb53d2

3 changed files with 36 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

73
po/ca/vedia.po
View file

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-01-21 09:32-0600\n" "POT-Creation-Date: 2026-01-20 22:29-0600\n"
"PO-Revision-Date: 2025-03-29 20:41-0600\n" "PO-Revision-Date: 2025-03-29 20:41-0600\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -114,7 +114,7 @@ msgid "No vote organized."
msgstr "Cap votació organitzada." msgstr "Cap votació organitzada."
#: ../views/admin_users.erb:30 ../views/admin_votes.erb:38 #: ../views/admin_users.erb:30 ../views/admin_votes.erb:38
#: ../views/votes_show_closed.erb:165 #: ../views/votes_show_closed.erb:155
msgid "Ratings" msgid "Ratings"
msgstr "Valoracions" msgstr "Valoracions"
@ -151,7 +151,7 @@ msgid "State: %{state}"
msgstr "Estat: %{state}" msgstr "Estat: %{state}"
#: ../views/admin_votes.erb:19 ../views/votes_edit.erb:90 #: ../views/admin_votes.erb:19 ../views/votes_edit.erb:90
#: ../views/votes_show_closed.erb:200 ../views/votes_show_draft.erb:29 #: ../views/votes_show_closed.erb:189 ../views/votes_show_draft.erb:29
#: ../views/votes_show_open.erb:88 #: ../views/votes_show_open.erb:88
msgid "Organizers" msgid "Organizers"
msgstr "Organitzadores" msgstr "Organitzadores"
@ -211,7 +211,7 @@ msgstr "Reiniciar contrasenya"
#: ../views/login.erb:12 ../views/reset.erb:13 ../views/reset_change.erb:13 #: ../views/login.erb:12 ../views/reset.erb:13 ../views/reset_change.erb:13
#: ../views/signup.erb:24 ../views/votes_edit.erb:102 #: ../views/signup.erb:24 ../views/votes_edit.erb:102
#: ../views/votes_show_closed.erb:214 ../views/votes_show_open.erb:104 #: ../views/votes_show_closed.erb:203 ../views/votes_show_open.erb:104
#: ../views/votes_show_unauthenticated.erb:9 #: ../views/votes_show_unauthenticated.erb:9
msgid "Email" msgid "Email"
msgstr "Correu" msgstr "Correu"
@ -320,7 +320,7 @@ msgid "Open vote to participants"
msgstr "Obrir la votació als votants" msgstr "Obrir la votació als votants"
#: ../views/votes_edit.erb:98 ../views/votes_edit.erb:105 #: ../views/votes_edit.erb:98 ../views/votes_edit.erb:105
#: ../views/votes_show_closed.erb:210 ../views/votes_show_closed.erb:217 #: ../views/votes_show_closed.erb:199 ../views/votes_show_closed.erb:206
#: ../views/votes_show_open.erb:100 ../views/votes_show_open.erb:107 #: ../views/votes_show_open.erb:100 ../views/votes_show_open.erb:107
msgid "Add organizer" msgid "Add organizer"
msgstr "Afegeix organitzadora" msgstr "Afegeix organitzadora"
@ -385,82 +385,51 @@ msgstr ""
"a href='https://en.wikipedia.org/wiki/Majority_judgment'><i>judici majoritari<" "a href='https://en.wikipedia.org/wiki/Majority_judgment'><i>judici majoritari<"
"/i></a>." "/i></a>."
#: ../views/votes_show_closed.erb:66 #: ../views/votes_show_closed.erb:67
msgid "See description" msgid "See description"
msgstr "Veure descripció" msgstr "Veure descripció"
#: ../views/votes_show_closed.erb:70 #: ../views/votes_show_closed.erb:71
msgid "Analyze tiebreak" msgid "Analyze tiebreak"
msgstr "Analitzar desempat" msgstr "Analitzar desempat"
#: ../views/votes_show_closed.erb:80 #: ../views/votes_show_closed.erb:81
msgid "This candidate and the winning candidate have the same majority judgment." msgid "This candidate and the winning candidate have the same majority judgment."
msgstr "Aquesta opció i l'opció guanyadora tenen el mateix judici majoritari." msgstr "Aquesta opció i l'opció guanyadora tenen el mateix judici majoritari."
#: ../views/votes_show_closed.erb:82 #: ../views/votes_show_closed.erb:83
msgid "" msgid ""
"To break the tie, we remove the vote that corresponds to the majority judgment" "To break the tie, we remove the vote that corresponds to the majority judgment"
" one-by-one until one candidate has a better majority judgment than the other." " one-by-one until one candidate has a better majority judgment than the other."
msgstr "" msgstr ""
"Pel desempat, traiem el vot que correspon al judici majoritari un per un fins " "Pel desempat, treiem el vot que correspon al judici majoritari un per un fins "
"que alguna opció tingui un millor judici majoritari que l'altre." "que alguna opció tingui un millor judici majoritari que l'altre."
#: ../views/votes_show_closed.erb:84 #: ../views/votes_show_closed.erb:85
msgid "Votes for this candidate" msgid "Votes for this candidate"
msgstr "Vots per aquesta opció" msgstr "Vots per aquesta opció"
#: ../views/votes_show_closed.erb:85 #: ../views/votes_show_closed.erb:86
msgid "Votes for the winning candidate" msgid "Votes for the winning candidate"
msgstr "Vots per l'opció guanyadora" msgstr "Vots per l'opció guanyadora"
#: ../views/votes_show_closed.erb:99 #: ../views/votes_show_closed.erb:99
msgid "" msgid "Without removing any vote."
"Without removing any vote, both candidates have the same majority judgement of" msgstr "Sense treure cap vot."
" %{current}."
msgstr ""
"Sense treure cap vot, les dues opcions tenen el mateix judici majoritari de "
"%{current}."
#: ../views/votes_show_closed.erb:104 #: ../views/votes_show_closed.erb:103
msgid "" msgid "Removing a vote of rating: "
"Removing a vote of rating %{previous}, both candidates still have the same maj" msgstr "Treient un vot de valoració: "
"ority judgement of %{current}."
msgstr ""
"Traient un vot de valoració %{previous}, les dues opcions encara tenen el mate"
"ix judici majoritari de %{current}."
#: ../views/votes_show_closed.erb:108 #: ../views/votes_show_closed.erb:108
msgid "" msgid "Removing another vote of rating: "
"Removing a vote of rating %{previous}, this candidate has a majority judgement" msgstr "Treient un altre vot de valoració: "
" of %{losing}, but the winning candidate has a majority judgement of %{winning"
"}."
msgstr ""
"Traient un vot de valoració %{previous}, aquesta opció te un judici majoritar"
"i de %{losing} però l'opció guanyadora te un judici majoritari de %{winning}."
#: ../views/votes_show_closed.erb:114 #: ../views/votes_show_closed.erb:160
msgid ""
"Removing another vote of rating %{previous}, both candidates still have the sa"
"me majority judgement of %{current}."
msgstr ""
"Traient un altre vot de valoració %{previous}, les dues opcions encara tenen e"
"l mateix judici majoritari de %{current}."
#: ../views/votes_show_closed.erb:118
msgid ""
"Removing another vote of rating %{previous}, this candidate has a majority jud"
"gement of %{losing}, but the winning candidate has a majority judgement of %{w"
"inning}."
msgstr ""
"Traient un altre vot de valoració %{previous}, aquesta opció te un judici maj"
"oritari de %{losing} però l'opció guanyadora te un judici majoritari de %{winn"
"ing}."
#: ../views/votes_show_closed.erb:170
msgid "Participant" msgid "Participant"
msgstr "Votant" msgstr "Votant"
#: ../views/votes_show_closed.erb:195 #: ../views/votes_show_closed.erb:184
msgid "Reopen voting period" msgid "Reopen voting period"
msgstr "Reobrir el període de votació" msgstr "Reobrir el període de votació"

1
views/rating_badge.erb
View file

@ -1 +0,0 @@
<span class="badge bg-<%= value[:id] %>"><%= _(value[:label]) %></span>

41
views/votes_show_closed.erb
View file

@ -44,7 +44,8 @@
<% end %> <% end %>
<p class="fs-5"> <p class="fs-5">
<%= "##{r}" %> <%= "##{r}" %>
<%= erb :rating_badge, :locals => { :value => settings.values.select { |e| e[:id] == c.mj.mj }.first } %> <% value = settings.values.select { |e| e[:id] == c.mj.mj }.first %>
<span class="badge bg-<%= value[:id] %>"><%= _(value[:label]) %></span>
</p> </p>
<h3><%= c.name %></h3> <h3><%= c.name %></h3>
<table class="table table-borderless"> <table class="table table-borderless">
@ -86,7 +87,7 @@
</div> </div>
<table class="table table-borderless tiebreak"> <table class="table table-borderless tiebreak">
<% n = 0 %> <% n = 0 %>
<% previous = nil %> <% previous = 0 %>
<% max = @results.first.mj.n * 2 + 1 %> <% max = @results.first.mj.n * 2 + 1 %>
<% c.mj.break_tie(@results.first.mj).each do |a, b| %> <% c.mj.break_tie(@results.first.mj).each do |a, b| %>
<tr class="tiebreak-top"> <tr class="tiebreak-top">
@ -95,30 +96,19 @@
<tr class="tiebreak-round"> <tr class="tiebreak-round">
<td colspan="<%= max %>"> <td colspan="<%= max %>">
<% if n == 0 %> <% if n == 0 %>
<% current = erb :rating_badge, :locals => { :value => settings.values.select { |e| e[:id] == a.mj }.first } %> <%= _("Without removing any vote.") %>
<%= _("Without removing any vote, both candidates have the same majority judgement of %{current}.") % { current: current } %>
<% end %> <% end %>
<% if n == 1 %> <% if n == 1 %>
<% if a.mj == b.mj %> <% value = settings.values.select { |e| e[:id] == previous }.first %>
<% current = erb :rating_badge, :locals => { :value => settings.values.select { |e| e[:id] == a.mj }.first } %> <%= _("Removing a vote of rating: ") %>
<%= _("Removing a vote of rating %{previous}, both candidates still have the same majority judgement of %{current}.") % { previous: previous, current: current } %> <span class="badge bg-<%= value[:id] %>"><%= _(value[:label]) %></span>
<% else %>
<% losing = erb :rating_badge, :locals => { :value => settings.values.select { |e| e[:id] == a.mj }.first } %>
<% winning = erb :rating_badge, :locals => { :value => settings.values.select { |e| e[:id] == b.mj }.first } %>
<%= _("Removing a vote of rating %{previous}, this candidate has a majority judgement of %{losing}, but the winning candidate has a majority judgement of %{winning}.") % { previous: previous, losing: losing, winning: winning } %>
<% end %>
<% end %> <% end %>
<% if n > 1 %> <% if n > 1 %>
<% if a.mj == b.mj %> <% value = settings.values.select { |e| e[:id] == previous }.first %>
<% current = erb :rating_badge, :locals => { :value => settings.values.select { |e| e[:id] == a.mj }.first } %> <%= _("Removing another vote of rating: ") %>
<%= _("Removing another vote of rating %{previous}, both candidates still have the same majority judgement of %{current}.") % { previous: previous, current: current } %> <span class="badge bg-<%= value[:id] %>"><%= _(value[:label]) %></span>
<% else %>
<% losing = erb :rating_badge, :locals => { :value => settings.values.select { |e| e[:id] == a.mj }.first } %>
<% winning = erb :rating_badge, :locals => { :value => settings.values.select { |e| e[:id] == b.mj }.first } %>
<%= _("Removing another vote of rating %{previous}, this candidate has a majority judgement of %{losing}, but the winning candidate has a majority judgement of %{winning}.") % { previous: previous, losing: losing, winning: winning } %>
<% end %>
<% end %> <% end %>
<% previous = erb :rating_badge, :locals => { :value => settings.values.select { |e| e[:id] == a.mj }.first } %> <% previous = a.mj %>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -177,11 +167,10 @@
<tr> <tr>
<td><%= user.email %></td> <td><%= user.email %></td>
<% @vote.candidates.each do |candidate| %> <% @vote.candidates.each do |candidate| %>
<% if rating = @vote.ratings.find { |rating| rating.user == user and rating.candidate == candidate } %> <% if rating = @vote.ratings.find { |rating| rating.user == user and rating.candidate == candidate } %>
<td class="h5"> <% value = settings.values.select { |e| e[:id] == rating.value }.first %>
<%= erb :rating_badge, :locals => { :value => settings.values.select { |e| e[:id] == rating.value }.first } %> <td class="h5"><span class="badge bg-<%= value[:id] %>"><%= _(value[:label]) %></td>
</td> <% end %>
<% end %>
<% end %> <% end %>
</tr> </tr>
<% end %> <% end %>