From 2df86f27196e4957fd05db1583ee8df99d63abc6 Mon Sep 17 00:00:00 2001 From: Starfall Date: Wed, 12 Aug 2020 22:41:33 -0500 Subject: Add Plural Cafe locale --- app/helpers/settings_helper.rb | 1 + app/javascript/flavours/glitch/locales/en-cafe.js | 8 ++++++++ app/javascript/locales/locale-data/en-cafe.js | 8 ++++++++ app/javascript/mastodon/locales/en-cafe.json | 13 +++++++++++++ app/javascript/mastodon/locales/locale-data/en-cafe.js | 8 ++++++++ app/javascript/mastodon/locales/whitelist_en-cafe.json | 2 ++ config/application.rb | 5 +++-- config/locales/en-cafe.yml | 18 ++++++++++++++++++ 8 files changed, 61 insertions(+), 2 deletions(-) create mode 100755 app/javascript/flavours/glitch/locales/en-cafe.js create mode 100755 app/javascript/locales/locale-data/en-cafe.js create mode 100755 app/javascript/mastodon/locales/en-cafe.json create mode 100755 app/javascript/mastodon/locales/locale-data/en-cafe.js create mode 100755 app/javascript/mastodon/locales/whitelist_en-cafe.json create mode 100755 config/locales/en-cafe.yml diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 87718dc05..745778bcd 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -15,6 +15,7 @@ module SettingsHelper de: 'Deutsch', el: 'Ελληνικά', en: 'English', + 'en-cafe': 'English (Plural Café)', eo: 'Esperanto', 'es-AR': 'Español (Argentina)', es: 'Español', diff --git a/app/javascript/flavours/glitch/locales/en-cafe.js b/app/javascript/flavours/glitch/locales/en-cafe.js new file mode 100755 index 000000000..6886de5d3 --- /dev/null +++ b/app/javascript/flavours/glitch/locales/en-cafe.js @@ -0,0 +1,8 @@ +import base_english from 'flavours/glitch/locales/en'; +import inherited from 'mastodon/locales/en-cafe.json'; + +const messages = { + // No new translations for glitch-soc strings. +}; + +export default Object.assign({}, base_english, inherited, messages); diff --git a/app/javascript/locales/locale-data/en-cafe.js b/app/javascript/locales/locale-data/en-cafe.js new file mode 100755 index 000000000..363aabc2b --- /dev/null +++ b/app/javascript/locales/locale-data/en-cafe.js @@ -0,0 +1,8 @@ +/*eslint eqeqeq: "off"*/ +/*eslint no-nested-ternary: "off"*/ +/*eslint quotes: "off"*/ + +export default [{ + locale: "en-cafe', + parentLocale: 'en', +}]; diff --git a/app/javascript/mastodon/locales/en-cafe.json b/app/javascript/mastodon/locales/en-cafe.json new file mode 100755 index 000000000..2f048f662 --- /dev/null +++ b/app/javascript/mastodon/locales/en-cafe.json @@ -0,0 +1,13 @@ +{ + "upload_form.edit": "Describe", + "upload_modal.description_placeholder": "Jackdaws love my big sphinx of quartz", + "upload_modal.edit_media": "Add description", + + "column.community": "Plural Café", + "directory.local": "From Plural Café only", + "empty_column.community": "The Plural Café timeline is empty. Write something publicly to get the ball rolling!", + "getting_started.open_source_notice": "GlitchCafé is open source software. You can contribute or report issues on GitHub at {github}.", + "introduction.federation.local.text": "Public posts from people on Plural Café will appear in the local timeline.", + "navigation_bar.community_timeline": "Plural Café timeline", + "tabs_bar.local_timeline": "Plural Café" +} diff --git a/app/javascript/mastodon/locales/locale-data/en-cafe.js b/app/javascript/mastodon/locales/locale-data/en-cafe.js new file mode 100755 index 000000000..363aabc2b --- /dev/null +++ b/app/javascript/mastodon/locales/locale-data/en-cafe.js @@ -0,0 +1,8 @@ +/*eslint eqeqeq: "off"*/ +/*eslint no-nested-ternary: "off"*/ +/*eslint quotes: "off"*/ + +export default [{ + locale: "en-cafe', + parentLocale: 'en', +}]; diff --git a/app/javascript/mastodon/locales/whitelist_en-cafe.json b/app/javascript/mastodon/locales/whitelist_en-cafe.json new file mode 100755 index 000000000..0d4f101c7 --- /dev/null +++ b/app/javascript/mastodon/locales/whitelist_en-cafe.json @@ -0,0 +1,2 @@ +[ +] diff --git a/config/application.rb b/config/application.rb index 9c632fefc..68a1917b7 100644 --- a/config/application.rb +++ b/config/application.rb @@ -58,6 +58,7 @@ module Mastodon :de, :el, :en, + :'en-cafe', :eo, :es, :'es-AR', @@ -119,11 +120,11 @@ module Mastodon config.i18n.default_locale = ENV['DEFAULT_LOCALE']&.to_sym unless config.i18n.available_locales.include?(config.i18n.default_locale) - config.i18n.default_locale = :en + config.i18n.default_locale = :'en-cafe' end # fall back to English when a translation cannot be found - config.i18n.fallbacks = [:en] + config.i18n.fallbacks = [:'en-cafe', :en] # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb') # config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')] diff --git a/config/locales/en-cafe.yml b/config/locales/en-cafe.yml new file mode 100755 index 000000000..c41527468 --- /dev/null +++ b/config/locales/en-cafe.yml @@ -0,0 +1,18 @@ +--- +en-cafe: + about: + hosted_on: GlitchCafé hosted on %{domain} + unavailable_content: Domain blocks + unavailable_content_description: + domain: Instance + reason: Reason + rejecting_media: 'Media files from these instances will not be processed or stored, and no thumbnails will be displayed, requiring manual click-through to the original file:' + rejecting_media_title: Filtered media + silenced: 'Posts from these instances will be hidden in public timelines and conversations, and no notifications will be generated from their users interactions, unless you are following them:' + silenced_title: Silenced instances + suspended: 'No data from these instances will be processed, stored or exchanged, making any interaction or communication with users from these instances impossible:' + suspended_title: Suspended instances + auth: + description: + prefix_invited_by_user: "@%{name} invites you to join %{title}!" + prefix_sign_up: Sign up on %{intance} today! -- cgit