Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add UTC in the contest page #76

Merged
merged 3 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions i18n/en.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"@metadata": {
"authors": [
"Samwilson"
]
"authors": ["Samwilson"]
},

"app-title": "Wikisource Contests",
Expand All @@ -28,6 +26,8 @@
"privacy-help": "Who is able to view contest scores (admins can always view all their contests).",
"end-date-label": "End date and time:",
"start-date-label": "Start date and time:",
"end-date-formatted": "End date and time: $1 UTC",
"start-date-formatted": "Start date and time: $1 UTC",
"times-are-utc": "Times are in UTC timezone.",
"excluded-users": "Excluded users:",
"administrators": "Administrators:",
Expand Down Expand Up @@ -76,7 +76,7 @@
"issue-tracker": "Issue tracker",

"deleted-successfully": "Contest $1 deleted successfully",
"proceed-caution": "Proceed with caution",
"proceed-caution": "Proceed with caution",
"irreversible-action": "This action is irreversible and all data related to the contest will be lost forever",
"delete-contest": "Delete contest",

Expand All @@ -87,5 +87,4 @@
"confirm-delete-text": "Please confirm that you want to delete",
"do-not-delete": "Don't delete",
"confirm-delete": "Yes, I confirm"

}
2 changes: 2 additions & 0 deletions i18n/qqq.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
"privacy-help": "Help text for privacy form field.",
"end-date-label": "Form label for the 'end date and time' field.",
"start-date-label": "Form label for the 'start date and time' field.",
"start-date-formatted": "Message displayed to show the start date and time of a contest. Parameters:\n\n* $1 - start date and time (e.g., '2024-11-30 18:00:42')",
"end-date-formatted": "Message displayed to show the end date and time of a contest. Parameters:\n\n* $1 - end date and time (e.g., '2024-11-30 18:00:42')",
"times-are-utc": "Help text for all time fields.",
"excluded-users": "Form label for the 'excluded users' field.",
"administrators": "Form label for the 'administrators' field.",
Expand Down
4 changes: 2 additions & 2 deletions templates/contests_view.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
{% if contest.privacy == 3 %}{{ msg('privacy-private') }}{% endif %}
</dd>
<dt>{{ msg('dates') }}</dt>
<dd>{{ msg('start-date-label') }} {{ contest.start_date }}</dd>
<dd>{{ msg('end-date-label') }} {{ contest.end_date }}</dd>
<dd>{{ msg('start-date-formatted', [contest.start_date]) }}</dd>
<dd>{{ msg('end-date-formatted', [contest.end_date]) }}</dd>
<dt>{{ msg('administrators') }}</dt>
<dd>
<ul class="list-inline">
Expand Down
4 changes: 2 additions & 2 deletions templates/contests_view.wikitext.twig
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
== {{ msg('contest', [contest.name]) }} ==

; {{ msg('dates') }}
: {{ msg('start-date-label') }} {{ contest.start_date }}
: {{ msg('end-date-label') }} {{ contest.end_date }}
: {{ msg('start-date-formatted', [contest.start_date]) }}
: {{ msg('end-date-formatted', [contest.end_date]) }}
; {{ msg('url') }}
: {{ url('contests_view', {id: contest.id}) }}
; {{ msg('administrators') }}
Expand Down