Compare commits

..

2 commits

Author SHA1 Message Date
495d29a0ae Set time zone when resetting password 2026-01-26 22:53:31 -06:00
ba77d19950 Update POT file 2026-01-26 22:53:08 -06:00
3 changed files with 45 additions and 19 deletions

View file

@ -8,8 +8,8 @@ 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-20 22:29-0600\n" "POT-Creation-Date: 2026-01-21 09:33-0600\n"
"PO-Revision-Date: 2026-01-20 22:29-0600\n" "PO-Revision-Date: 2026-01-21 09:33-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"
"Language: \n" "Language: \n"
@ -115,7 +115,7 @@ msgid "No vote organized."
msgstr "" msgstr ""
#: ../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:155 #: ../views/votes_show_closed.erb:165
msgid "Ratings" msgid "Ratings"
msgstr "" msgstr ""
@ -152,7 +152,7 @@ msgid "State: %{state}"
msgstr "" msgstr ""
#: ../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:189 ../views/votes_show_draft.erb:29 #: ../views/votes_show_closed.erb:200 ../views/votes_show_draft.erb:29
#: ../views/votes_show_open.erb:88 #: ../views/votes_show_open.erb:88
msgid "Organizers" msgid "Organizers"
msgstr "" msgstr ""
@ -210,7 +210,7 @@ msgstr ""
#: ../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:203 ../views/votes_show_open.erb:104 #: ../views/votes_show_closed.erb:214 ../views/votes_show_open.erb:104
#: ../views/votes_show_unauthenticated.erb:9 #: ../views/votes_show_unauthenticated.erb:9
msgid "Email" msgid "Email"
msgstr "" msgstr ""
@ -317,7 +317,7 @@ msgid "Open vote to participants"
msgstr "" msgstr ""
#: ../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:199 ../views/votes_show_closed.erb:206 #: ../views/votes_show_closed.erb:210 ../views/votes_show_closed.erb:217
#: ../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 "" msgstr ""
@ -377,49 +377,69 @@ msgid ""
"nt</i></a>." "nt</i></a>."
msgstr "" msgstr ""
#: ../views/votes_show_closed.erb:67 #: ../views/votes_show_closed.erb:66
msgid "See description" msgid "See description"
msgstr "" msgstr ""
#: ../views/votes_show_closed.erb:71 #: ../views/votes_show_closed.erb:70
msgid "Analyze tiebreak" msgid "Analyze tiebreak"
msgstr "" msgstr ""
#: ../views/votes_show_closed.erb:81 #: ../views/votes_show_closed.erb:80
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 "" msgstr ""
#: ../views/votes_show_closed.erb:83 #: ../views/votes_show_closed.erb:82
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 ""
#: ../views/votes_show_closed.erb:85 #: ../views/votes_show_closed.erb:84
msgid "Votes for this candidate" msgid "Votes for this candidate"
msgstr "" msgstr ""
#: ../views/votes_show_closed.erb:86 #: ../views/votes_show_closed.erb:85
msgid "Votes for the winning candidate" msgid "Votes for the winning candidate"
msgstr "" msgstr ""
#: ../views/votes_show_closed.erb:99 #: ../views/votes_show_closed.erb:99
msgid "Without removing any vote." msgid ""
"Without removing any vote, both candidates have the same majority judgement of"
" %{current}."
msgstr "" msgstr ""
#: ../views/votes_show_closed.erb:103 #: ../views/votes_show_closed.erb:104
msgid "Removing a vote of rating: " msgid ""
"Removing a vote of rating %{previous}, both candidates still have the same maj"
"ority judgement of %{current}."
msgstr "" msgstr ""
#: ../views/votes_show_closed.erb:108 #: ../views/votes_show_closed.erb:108
msgid "Removing another vote of rating: " msgid ""
"Removing a vote of rating %{previous}, this candidate has a majority judgement"
" of %{losing}, but the winning candidate has a majority judgement of %{winning"
"}."
msgstr "" msgstr ""
#: ../views/votes_show_closed.erb:160 #: ../views/votes_show_closed.erb:114
msgid ""
"Removing another vote of rating %{previous}, both candidates still have the sa"
"me majority judgement of %{current}."
msgstr ""
#: ../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 ""
#: ../views/votes_show_closed.erb:170
msgid "Participant" msgid "Participant"
msgstr "" msgstr ""
#: ../views/votes_show_closed.erb:184 #: ../views/votes_show_closed.erb:195
msgid "Reopen voting period" msgid "Reopen voting period"
msgstr "" msgstr ""

View file

@ -204,6 +204,7 @@ post '/reset/:uuid' do
@user.save @user.save
session.clear session.clear
session[:user_id] = @user.id session[:user_id] = @user.id
session[:timezone] = params[:timezone]
redirect '/' redirect '/'
else else
erb :reset_change erb :reset_change

View file

@ -8,7 +8,7 @@
<% end %> <% end %>
<% end %> <% end %>
<form action="/reset/<%= params[:uuid] %>" method="post"> <form action="/reset/<%= params[:uuid] %>" name="reset" method="post">
<div class="mb-3"> <div class="mb-3">
<label for="email" class="form-label"><%= _("Email") %></label> <label for="email" class="form-label"><%= _("Email") %></label>
<p><strong><%= @user.email %></strong></p> <p><strong><%= @user.email %></strong></p>
@ -17,5 +17,10 @@
<label for="password" class="form-label"><%= _("Password") %></label> <label for="password" class="form-label"><%= _("Password") %></label>
<input type="password" name="password" value="<%= params[:password] %>" class="form-control"> <input type="password" name="password" value="<%= params[:password] %>" class="form-control">
</div> </div>
<input type="hidden" name="timezone" value="UTC">
<button type="submit" class="btn btn-primary"><%= _("Reset password") %></button> <button type="submit" class="btn btn-primary"><%= _("Reset password") %></button>
</form> </form>
<script>
document.reset.timezone.value = Intl.DateTimeFormat().resolvedOptions().timeZone;
</script>