From e82de8035dca2f290d104d4658127a7577b1d754 Mon Sep 17 00:00:00 2001 From: nightpool Date: Tue, 13 Mar 2018 19:08:36 -0400 Subject: [PATCH] cybre-locale: new stings for 2.3.1 + datetime fixes --- .../mastodon/components/relative_timestamp.js | 8 +++++++- app/javascript/mastodon/locales/en-CY.json | 16 +++++++++------- config/i18n-tasks.yml | 1 + config/locales/en-CY.yml | 6 ++++-- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/app/javascript/mastodon/components/relative_timestamp.js b/app/javascript/mastodon/components/relative_timestamp.js index 3c8db7092..5d4f19506 100644 --- a/app/javascript/mastodon/components/relative_timestamp.js +++ b/app/javascript/mastodon/components/relative_timestamp.js @@ -60,6 +60,8 @@ const getUnitDelay = units => { } }; +const fallbackFormat = new Intl.DateTimeFormat('en', shortDateFormatOptions); + @injectIntl export default class RelativeTimestamp extends React.Component { @@ -139,7 +141,11 @@ export default class RelativeTimestamp extends React.Component { relativeTime = intl.formatMessage(messages.days, { number: Math.floor(delta / DAY) }); } } else if (date.getFullYear() === year) { - relativeTime = intl.formatDate(date, shortDateFormatOptions); + if (intl.locale === 'en-CY') { + relativeTime = fallbackFormat.format(date); + } else { + relativeTime = intl.formatDate(date, shortDateFormatOptions); + } } else { relativeTime = intl.formatDate(date, { ...shortDateFormatOptions, year: 'numeric' }); } diff --git a/app/javascript/mastodon/locales/en-CY.json b/app/javascript/mastodon/locales/en-CY.json index d2c0490ee..040e843cf 100644 --- a/app/javascript/mastodon/locales/en-CY.json +++ b/app/javascript/mastodon/locales/en-CY.json @@ -17,7 +17,7 @@ "account.mute_notifications": "Mute notifications from @{name}", "account.muted": "Muted", "account.posts": "Pings", - "account.posts_with_replies": "Toots with replies", + "account.posts_with_replies": "Pings with replies", "account.report": "Report @{name}", "account.requested": "Awaiting approval. Click to cancel follow request", "account.share": "Share @{name}'s profile", @@ -58,14 +58,16 @@ "compose.attach": "Attach...", "compose.attach.doodle": "Draw something", "compose.attach.upload": "Upload a file", - "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.", + "compose_form.hashtag_warning": "This ping won't be listed under any hashtag as it is unlisted. Only public pings can be searched by hashtag.", "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.", "compose_form.lock_disclaimer.lock": "locked", "compose_form.placeholder": "What is in your databanks?", "compose_form.publish": "Ping", "compose_form.publish_loud": "{publish}!", - "compose_form.sensitive": "Mark media as sensitive", - "compose_form.spoiler": "Hide text behind warning", + "compose_form.sensitive.marked": "Media is marked as sensitive", + "compose_form.sensitive.unmarked": "Media is not marked as sensitive", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Write your warning here", "confirmation_modal.cancel": "Cancel", "confirmations.block.confirm": "Block", @@ -132,7 +134,7 @@ "keyboard_shortcuts.mention": "to mention author", "keyboard_shortcuts.reply": "to reply", "keyboard_shortcuts.search": "to focus search", - "keyboard_shortcuts.toot": "to start a brand new toot", + "keyboard_shortcuts.toot": "to start a brand new ping", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "to move up in the list", "lightbox.close": "Close", @@ -233,7 +235,7 @@ "search_popout.tips.user": "user", "search_results.accounts": "People", "search_results.hashtags": "Hashtags", - "search_results.statuses": "Toots", + "search_results.statuses": "Pings", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", "standalone.public_title": "Peer into the data grid...", "status.block": "Block @{name}", @@ -249,7 +251,7 @@ "status.mute_conversation": "Mute conversation", "status.open": "Expand this status", "status.pin": "Pin on profile", - "status.pinned": "Pinned toot", + "status.pinned": "Pinned ping", "status.reblog": "Relay", "status.reblogged_by": "{name} relayed", "status.reply": "Reply", diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index eec8b6dbe..0374eb336 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -30,6 +30,7 @@ search: - app/assets/images - app/assets/fonts - app/assets/videos + - app/javascript/images ignore_missing: - 'activemodel.errors.*' diff --git a/config/locales/en-CY.yml b/config/locales/en-CY.yml index 39f76a3f3..9ddc100a6 100644 --- a/config/locales/en-CY.yml +++ b/config/locales/en-CY.yml @@ -1,6 +1,7 @@ --- en-CY: about: + about_hashtag_html: These are public pings tagged with #%{hashtag}. You can interact with them if you have an account anywhere in the fediverse about_mastodon_html: Cybrespace is an instance of Mastodon, a social network based on open web protocols and free, open-source software. It is decentralized like e-mail. about_this: About closed_registrations: Registrations are currently closed on this instance. However! You can find a different instance to make an account on and get access to the very same network from there. @@ -446,8 +447,9 @@ en-CY: open_in_web: Open in web over_character_limit: character limit of %{max} exceeded pin_errors: - ownership: Someone else's toot cannot be pinned - private: Non-public toot cannot be pinned + limit: You have already pinned the maximum number of pings + ownership: Someone else's ping cannot be pinned + private: Non-public pings cannot be pinned reblog: A boost cannot be pinned show_more: Show more visibilities: