From 3d709b73d09588435dd6f9e44227f480c09e4bb2 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 25 Sep 2015 15:37:00 +0930 Subject: [PATCH 001/272] Initial commit --- extensions/lang-english/README.md | 17 ++ extensions/lang-english/bootstrap.php | 47 +++++ extensions/lang-english/flarum.json | 26 +++ extensions/lang-english/locale/.gitkeep.md | 0 extensions/lang-english/locale/config.js | 5 + extensions/lang-english/locale/config.php | 9 + extensions/lang-english/locale/core.yml | 230 +++++++++++++++++++++ 7 files changed, 334 insertions(+) create mode 100644 extensions/lang-english/README.md create mode 100644 extensions/lang-english/bootstrap.php create mode 100644 extensions/lang-english/flarum.json create mode 100644 extensions/lang-english/locale/.gitkeep.md create mode 100644 extensions/lang-english/locale/config.js create mode 100644 extensions/lang-english/locale/config.php create mode 100644 extensions/lang-english/locale/core.yml diff --git a/extensions/lang-english/README.md b/extensions/lang-english/README.md new file mode 100644 index 000000000..82c5829b0 --- /dev/null +++ b/extensions/lang-english/README.md @@ -0,0 +1,17 @@ +# English Language Pack for Flarum + +## Installation + +This language pack is bundled with [Flarum](http://flarum.org/download/). + +## Translating Flarum + +1. Fork this repository. +2. Edit the [flarum.json](flarum.json) file: + - `name` A lowercase and hyphens only name (e.g. **french**, **drunk-pirates**). + - `title` A short descriptive label for the extension list (e.g. **French**, **Drunk Pirates Arr**). + - `locale` An [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) code of your locale, or a short identifier of at least 3 characters to prevent conflicts (e.g. **fr**, **pirate**). + - `description` Complete description, possible in the same language (e.g. **Francaise pour vous**, **Arrr matey hoist the sails**). + - `author` Replace with your own information. + - `icon` Change to suit your needs, play with the name for the FontAwesome icon, color for the icon color and background for the background color of the icon. +3. Modify the files under `/locale` to suit your needs. These hold all the actual translations. diff --git a/extensions/lang-english/bootstrap.php b/extensions/lang-english/bootstrap.php new file mode 100644 index 000000000..54888ef87 --- /dev/null +++ b/extensions/lang-english/bootstrap.php @@ -0,0 +1,47 @@ +listen(RegisterLocales::class, function(RegisterLocales $event) { + $locale = $name = null; + + if (file_exists($manifest = __DIR__.'/flarum.json')) { + $json = json_decode(file_get_contents($manifest), true); + $locale = array_key_exists('locale', $json) ? $json['locale'] : null; + $name = array_key_exists('name', $json) ? $json['name'] : null; + unset($json); + } + + if ($name === null) { + throw new RuntimeException("Language pack ".__DIR__." needs a \"name\" in flarum.json."); + } + + if ($locale === null) { + throw new RuntimeException("Language pack {$name} needs a \"locale\" in flarum.json."); + } + + $event->addLocale($locale, $name); + + if (! is_dir($localeDir = __DIR__.'/locale')) { + throw new RuntimeException("Language pack {$name} needs a \"locale\" subdirectory."); + } + + if (file_exists($file = $localeDir.'/config.js')) { + $event->addJsFile($locale, $file); + } + + if (file_exists($file = $localeDir.'/config.php')) { + $event->addConfig($locale, $file); + } + + $files = new DirectoryIterator($localeDir); + + foreach ($files as $file) { + if ($file->isFile() && in_array($file->getExtension(), ['yml', 'yaml'])) { + $event->addTranslations($locale, $file->getPathname()); + } + } + }); +}; diff --git a/extensions/lang-english/flarum.json b/extensions/lang-english/flarum.json new file mode 100644 index 000000000..68c088ff1 --- /dev/null +++ b/extensions/lang-english/flarum.json @@ -0,0 +1,26 @@ +{ + "name": "english", + "title": "English", + "locale": "en", + "description": "English language pack.", + "keywords": ["language"], + "version": "0.1.0-beta.3", + "author": { + "name": "Toby Zerner", + "email": "toby@flarum.org", + "homepage": "http://tobyzerner.com" + }, + "license": "MIT", + "require": { + "flarum": ">=0.1.0-beta.3" + }, + "support": { + "source": "https://github.com/flarum/english", + "issues": "https://github.com/flarum/core/issues" + }, + "icon": { + "name": "globe", + "backgroundColor": "#eee", + "color": "#000" + } +} diff --git a/extensions/lang-english/locale/.gitkeep.md b/extensions/lang-english/locale/.gitkeep.md new file mode 100644 index 000000000..e69de29bb diff --git a/extensions/lang-english/locale/config.js b/extensions/lang-english/locale/config.js new file mode 100644 index 000000000..c85996282 --- /dev/null +++ b/extensions/lang-english/locale/config.js @@ -0,0 +1,5 @@ +// See http://flarum.org/docs/localization to learn how this file works. + +app.translator.plural = function(count) { + return count == 1 ? 'one' : 'other'; +}; diff --git a/extensions/lang-english/locale/config.php b/extensions/lang-english/locale/config.php new file mode 100644 index 000000000..b9cd84fef --- /dev/null +++ b/extensions/lang-english/locale/config.php @@ -0,0 +1,9 @@ + function ($count) { + return $count == 1 ? 'one' : 'other'; + } +]; diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml new file mode 100644 index 000000000..546258374 --- /dev/null +++ b/extensions/lang-english/locale/core.yml @@ -0,0 +1,230 @@ +core: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # These strings are used in the Change Email modal dialog. + change_email_confirmation_message: => core.confirmation_email_sent + change_email_go_to_button: => core.go_to_url + change_email_submit_button: => core.save_changes + change_email_title: => core.change_email + + # These strings are used in the Change Password modal dialog. + change_password_send_button: Send Password Reset Email + change_password_text: Click the button below and check your email for a link to change your password. + change_password_title: => core.change_password + + # These strings are used by the Composer controls. + composer_close_tooltip: Close + composer_exit_full_screen_tooltip: Exit Full Screen + composer_full_screen_tooltip: Full Screen + composer_minimize_tooltip: Minimize + + # These strings are used by the Composer when starting a discussion. + composer_discussion_body_placeholder: Write a Post... + composer_discussion_discard_confirmation: You have not posted your discussion. Do you wish to discard it? + composer_discussion_submit_button: Post Discussion + composer_discussion_title_placeholder: Discussion Title + + # These strings are used by the Composer when editing a post. + composer_edit_discard_confirmation: You have not saved your changes. Do you wish to discard them? + composer_edit_post_link: "Post #{number} in {discussion}" + composer_edit_submit_button: => core.save_changes + + # These strings are used by the Composer when replying to a discussion. + composer_reply_body_placeholder: => core.write_a_reply + composer_reply_discard_confirmation: You have not posted your reply. Do you wish to discard it? + composer_reply_posted_message: Your reply was posted. + composer_reply_submit_button: Post Reply + composer_reply_view_button: View + + # These strings are used by the discussion control buttons. + discussion_controls_cannot_reply_button: Can't Reply + discussion_controls_cannot_reply_text: You don't have permission to reply to this discussion. + discussion_controls_delete_button: => core.delete + discussion_controls_delete_confirmation: Are you sure you want to delete this discussion? + discussion_controls_delete_forever_button: => core.delete_forever + discussion_controls_log_in_to_reply_button: Log In to Reply + discussion_controls_rename_button: Rename + discussion_controls_rename_text: Enter a new title for this discussion: + discussion_controls_reply_button: Reply + discussion_controls_restore_button: => core.restore + + # These strings are used in the discussion list. + discussion_list_load_more_button: => core.load_more + discussion_list_mark_as_read_tooltip: Mark as Read + discussion_list_replied_text: "{username} replied {ago}" + discussion_list_started_text: "{username} started {ago}" + + # These strings are used in the Edit User modal dialog (moderator function). + edit_user_email_label: => core.email + edit_user_password_label: => core.password + edit_user_submit_button: => core.save_changes + edit_user_username_label: => core.username + + # These strings are used in the Forgot Password modal dialog. + forgot_password_go_to_button: => core.go_to_url + forgot_password_email_placeholder: => core.email + forgot_password_email_sent_message: We've sent you an email containing a link to reset your password. Check your spam folder if you don't receive it within the next minute or two. + forgot_password_submit_button: Recover Password + forgot_password_text: Enter your email address and we will send you a link to reset your password. + forgot_password_title: Forgot Password + + # These strings are used in the header and session dropdown menu. + header_admin_button: Administration + header_log_in_link: => core.log_in + header_log_out_button: Log Out + header_profile_button: Profile + header_search_placeholder: Search Forum + header_settings_button: => core.settings + header_sign_up_link: => core.sign_up + + # These strings are used on the index page, peripheral to the discussion list. + index_all_discussions_link: All Discussions + index_cannot_start_discussion_button: "Can't Start Discussion" + index_mark_all_as_read_tooltip: => core.mark_all_as_read + index_refresh_tooltip: Refresh + index_start_discussion_button: Start a Discussion + + # These strings are used by the sorting control above the discussion list. + index_sort_latest_button: Latest + index_sort_newest_button: Newest + index_sort_oldest_button: Oldest + index_sort_relevance_button: Relevance + index_sort_top_button: Top + + # These strings are used in the Log In modal dialog. + log_in_confirmation_required_message: "You need to confirm your email before you can log in. We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." + log_in_forgot_password_link: Forgot password? + log_in_invalid_login_message: Your login details were incorrect. + log_in_no_account_text: "Don't have an account? " # Final space is needed for string separation. + log_in_password_placeholder: => core.password + log_in_sign_up_link: => core.sign_up + log_in_submit_button: => core.log_in + log_in_title: => core.log_in + log_in_username_or_email_placeholder: Username or Email + + # These strings are used by the Notifications dropdown, a.k.a. "the bell". + notifications_discussion_renamed_text: "{username} changed the title" + notifications_empty_text: No Notifications + notifications_mark_all_as_read_tooltip: => core.mark_all_as_read + notifications_title: => core.notifications + notifications_tooltip: => core.notifications + + # These strings are used by tooltips displayed for individual posts. + post_edited_tooltip: "{username} edited {ago}" + post_number_tooltip: "Post #{number}" + + # These strings are used by the post control buttons. + post_controls_delete_button: => core.delete + post_controls_delete_forever_button: => core.delete_forever + post_controls_edit_button: => core.edit + post_controls_restore_button: => core.restore + + # These strings are used in the scrubber to the right of the post stream. + post_scrubber_now_link: Now + post_scrubber_original_post_link: Original Post + post_scrubber_unread_text: "{count} unread" + post_scrubber_viewing_text: + one: "{index} of {count} post" + other: "{index} of {count} posts" + + # These strings are displayed between posts in the post stream. + post_stream_discussion_renamed_text: "{username} changed the title from {old} to {new}." + post_stream_reply_placeholder: => core.write_a_reply + post_stream_time_lapsed_text: "{period} later" + + # These strings are used by the search results dropdown list. + search_all_discussions_button: 'Search all discussions for "{query}"' + search_discussions_heading: => core.discussions + search_users_heading: Users + + # These strings are used in the Settings page. + settings_account_heading: Account + settings_change_email_button: => core.change_email + settings_change_password_button: => core.change_password + settings_notifications_heading: => core.notifications + settings_privacy_disclose_online_label: Allow others to see when I am online + settings_privacy_heading: Privacy + settings_title: => core.settings + + # These strings are used in the Notifications grid on the Settings page. + settings_notify_by_email_heading: => core.email + settings_notify_by_web_heading: Web + settings_notify_discussion_renamed_label: Someone renames a discussion I started + + # These strings are used in the Sign Up modal dialog. + sign_up_already_have_account_text: "Already have an account? " # Final space is needed for string separation. + sign_up_confirmation_message: => core.confirmation_email_sent + sign_up_email_placeholder: => core.email + sign_up_go_to_button: => core.go_to_url + sign_up_log_in_link: => core.log_in + sign_up_password_placeholder: => core.password + sign_up_submit_button: => core.sign_up + sign_up_title: => core.sign_up + sign_up_username_placeholder: => core.username + sign_up_welcome_text: "Welcome, {username}!" + + # These strings are used in the user profile page and profile popup. + user_bio_placeholder: Write something about yourself + user_discussions_link: => core.discussions + user_joined_date_text: "Joined {ago}" + user_online_text: Online + user_posts_load_more_button: => core.load_more + user_posts_link: Posts + user_settings_link: => core.settings + + # These strings are used to control the avatar in the user profile page. + user_avatar_remove_button: Remove + user_avatar_upload_button: Upload + + # These strings are found on the user profile page (moderator function). + user_controls_button: Controls + user_controls_delete_button: => core.delete + user_controls_edit_button: => core.edit + + ## + # REUSED STRINGS - The following keys are referenced by two or more unique keys. + ## + + change_email: Change Email + change_password: Change Password + confirmation_email_sent: "We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." + delete: Delete + delete_forever: Delete Forever + discussions: Discussions + edit: Edit + email: Email + go_to_url: "Go to {url}" + load_more: Load More + log_in: Log In + mark_all_as_read: Mark All as Read + notifications: Notifications + password: Password + restore: Restore + save_changes: Save Changes + settings: Settings + sign_up: Sign Up + username: Username + write_a_reply: Write a Reply... + + ## + # GLOBAL STRINGS - Keys in this section are used globally (or generated automatically). + ## + + # This string replaces a deleted username: + deleted_username: "[deleted]" + + # The following keys are generated from group names: + group_admin: Admin + group_admins: Admins + group_guest: Guest + group_guests: Guests + group_member: Member + group_members: Members + group_mod: Mod + group_mods: Mods + + # This string is currently unused: + powered_by_flarum: Powered by Flarum From b64f19332be2ab44c9df1fcf9b6567a9e1c6d770 Mon Sep 17 00:00:00 2001 From: Petrouchka Date: Fri, 25 Sep 2015 08:35:08 +0200 Subject: [PATCH 002/272] Update README.md --- extensions/lang-english/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/README.md b/extensions/lang-english/README.md index 82c5829b0..7642592a4 100644 --- a/extensions/lang-english/README.md +++ b/extensions/lang-english/README.md @@ -11,7 +11,7 @@ This language pack is bundled with [Flarum](http://flarum.org/download/). - `name` A lowercase and hyphens only name (e.g. **french**, **drunk-pirates**). - `title` A short descriptive label for the extension list (e.g. **French**, **Drunk Pirates Arr**). - `locale` An [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) code of your locale, or a short identifier of at least 3 characters to prevent conflicts (e.g. **fr**, **pirate**). - - `description` Complete description, possible in the same language (e.g. **Francaise pour vous**, **Arrr matey hoist the sails**). + - `description` Complete description, possible in the same language (e.g. **Française pour vous**, **Arrr matey hoist the sails**). - `author` Replace with your own information. - `icon` Change to suit your needs, play with the name for the FontAwesome icon, color for the icon color and background for the background color of the icon. 3. Modify the files under `/locale` to suit your needs. These hold all the actual translations. From 2b55cfc78f11dc8ad819f1c95d2347c65fa73d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Fri, 25 Sep 2015 17:22:19 +0200 Subject: [PATCH 003/272] Add a LICENSE file Because the skeleton is using the MIT License, we should add the LICENSE file. It will prevent translators to release the language extension without a LICENSE file (MIT or not, they will be able to change that file accoring to their choosen license). This will be explained in the future L10n documentation. --- extensions/lang-english/LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 extensions/lang-english/LICENSE diff --git a/extensions/lang-english/LICENSE b/extensions/lang-english/LICENSE new file mode 100644 index 000000000..4b92a42c7 --- /dev/null +++ b/extensions/lang-english/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Toby Zerner + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 3b86c486b539d535e4982e12d3026aa836d13a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Fri, 25 Sep 2015 17:28:14 +0200 Subject: [PATCH 004/272] Change the Font Awesome icon The "language" icon is better and more specific by default than the "globe" icon, which can be used on many non-language extensions. --- extensions/lang-english/flarum.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/flarum.json b/extensions/lang-english/flarum.json index 68c088ff1..ba6fddadb 100644 --- a/extensions/lang-english/flarum.json +++ b/extensions/lang-english/flarum.json @@ -19,7 +19,7 @@ "issues": "https://github.com/flarum/core/issues" }, "icon": { - "name": "globe", + "name": "language", "backgroundColor": "#eee", "color": "#000" } From c7b3dd9d6ba0dacc8d0e97e2b197637347a54b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Fri, 25 Sep 2015 17:33:07 +0200 Subject: [PATCH 005/272] Remove the unecessary .gitkeep The ".gitkeep" file is unecessary because the "locale/" subdirectory is now correctly tracked by Git due to its content. --- extensions/lang-english/locale/.gitkeep.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 extensions/lang-english/locale/.gitkeep.md diff --git a/extensions/lang-english/locale/.gitkeep.md b/extensions/lang-english/locale/.gitkeep.md deleted file mode 100644 index e69de29bb..000000000 From 17375aafa149df0da29835847035f622f7148897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Fri, 25 Sep 2015 17:39:33 +0200 Subject: [PATCH 006/272] Add .editorconfig for consistent coding styles --- extensions/lang-english/.editorconfig | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 extensions/lang-english/.editorconfig diff --git a/extensions/lang-english/.editorconfig b/extensions/lang-english/.editorconfig new file mode 100644 index 000000000..72e9364d7 --- /dev/null +++ b/extensions/lang-english/.editorconfig @@ -0,0 +1,17 @@ +# http://editorconfig.org/ + +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.{json,php}] +indent_size = 4 + +[*.md] +trim_trailing_whitespace = false From cd02134e090e5f4eb604dbecdad4fd746c86b0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Fri, 25 Sep 2015 17:42:09 +0200 Subject: [PATCH 007/272] Normalize line endings and export-ignore Ensure to normalize line endings to Unix (LF) and exclude some extra files which are uncessary to the extension itself when exporting an archive. --- extensions/lang-english/.gitattributes | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 extensions/lang-english/.gitattributes diff --git a/extensions/lang-english/.gitattributes b/extensions/lang-english/.gitattributes new file mode 100644 index 000000000..542973100 --- /dev/null +++ b/extensions/lang-english/.gitattributes @@ -0,0 +1,21 @@ +# Automatically normalize line endings for all text-based files +# http://git-scm.com/docs/gitattributes#_end_of_line_conversion +* text=auto + +# For the following file types, normalize line endings to LF on +# check in and prevent conversion to CRLF when they are checked out +# (this is required in order to prevent newline related issues like, +# for example, after the build script is run) +.* text eol=lf +*.js text eol=lf +*.json text eol=lf +*.md text eol=lf +*.php text eol=lf +*.yml text eol=lf + +# Exclude the following files when exporting an archive +# https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes#Exporting-Your-Repository +.editorconfig export-ignore +.gitattributes export-ignore +.gitignore export-ignore +README.md export-ignore From 70489092841feaecae3478635e803b2c71e72876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Fri, 25 Sep 2015 17:43:47 +0200 Subject: [PATCH 008/272] Ignore junks files to be added It includes common OS junk files, some common backup and log files and ensure that .git is ignored. --- extensions/lang-english/.gitignore | 40 ++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 extensions/lang-english/.gitignore diff --git a/extensions/lang-english/.gitignore b/extensions/lang-english/.gitignore new file mode 100644 index 000000000..7f2c67c26 --- /dev/null +++ b/extensions/lang-english/.gitignore @@ -0,0 +1,40 @@ +# Windows +Thumbs.db +ehthumbs.db +Desktop.ini +$RECYCLE.BIN/ +*.cab +*.msi +*.msm +*.msp +*.lnk + +# Mac OS +.DS_Store +.AppleDouble +.LSOverride +Icon +._* +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Linux +*~ +.directory +.Trash-* + +# Backup and log files +*.bak +*.log + +# Git +.git From e81c94961ea33c4bd5cf904cd94eb9624884c3c7 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 29 Sep 2015 15:20:02 +0930 Subject: [PATCH 009/272] Remove "go to email provider" translations ref flarum/core#541 --- extensions/lang-english/locale/core.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 546258374..d7bc7e0ca 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -6,7 +6,7 @@ core: # These strings are used in the Change Email modal dialog. change_email_confirmation_message: => core.confirmation_email_sent - change_email_go_to_button: => core.go_to_url + change_email_dismiss_button: => core.okay change_email_submit_button: => core.save_changes change_email_title: => core.change_email @@ -64,7 +64,7 @@ core: edit_user_username_label: => core.username # These strings are used in the Forgot Password modal dialog. - forgot_password_go_to_button: => core.go_to_url + forgot_password_dismiss_button: => core.okay forgot_password_email_placeholder: => core.email forgot_password_email_sent_message: We've sent you an email containing a link to reset your password. Check your spam folder if you don't receive it within the next minute or two. forgot_password_submit_button: Recover Password @@ -158,7 +158,7 @@ core: sign_up_already_have_account_text: "Already have an account? " # Final space is needed for string separation. sign_up_confirmation_message: => core.confirmation_email_sent sign_up_email_placeholder: => core.email - sign_up_go_to_button: => core.go_to_url + sign_up_dismiss_button: => core.okay sign_up_log_in_link: => core.log_in sign_up_password_placeholder: => core.password sign_up_submit_button: => core.sign_up @@ -196,11 +196,11 @@ core: discussions: Discussions edit: Edit email: Email - go_to_url: "Go to {url}" load_more: Load More log_in: Log In mark_all_as_read: Mark All as Read notifications: Notifications + okay: OK password: Password restore: Restore save_changes: Save Changes From d2cb4c2d77e8cd7b12af89aef564c4c0fe3c99d6 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 3 Oct 2015 16:24:08 +0930 Subject: [PATCH 010/272] Add some bundled extension translations But the key names are still yet to be redone. --- .../lang-english/locale/flarum-flags.yml | 8 ++++++++ .../lang-english/locale/flarum-likes.yml | 12 +++++++++++ .../lang-english/locale/flarum-lock.yml | 8 ++++++++ .../lang-english/locale/flarum-mentions.yml | 10 ++++++++++ .../lang-english/locale/flarum-pusher.yml | 4 ++++ .../lang-english/locale/flarum-sticky.yml | 8 ++++++++ .../locale/flarum-subscriptions.yml | 13 ++++++++++++ .../lang-english/locale/flarum-tags.yml | 20 +++++++++++++++++++ 8 files changed, 83 insertions(+) create mode 100644 extensions/lang-english/locale/flarum-flags.yml create mode 100644 extensions/lang-english/locale/flarum-likes.yml create mode 100644 extensions/lang-english/locale/flarum-lock.yml create mode 100644 extensions/lang-english/locale/flarum-mentions.yml create mode 100644 extensions/lang-english/locale/flarum-pusher.yml create mode 100644 extensions/lang-english/locale/flarum-sticky.yml create mode 100644 extensions/lang-english/locale/flarum-subscriptions.yml create mode 100644 extensions/lang-english/locale/flarum-tags.yml diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml new file mode 100644 index 000000000..890f5b5c0 --- /dev/null +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -0,0 +1,8 @@ +flarum-flags: + reason_off_topic: Off-topic + reason_spam: Spam + reason_inappropriate: Inappropriate + reason_other: Other + flagged_by: "{username} flagged" + flagged_by_with_reason: "{username} flagged as {reason}" + no_flags: No Flags diff --git a/extensions/lang-english/locale/flarum-likes.yml b/extensions/lang-english/locale/flarum-likes.yml new file mode 100644 index 000000000..73736b968 --- /dev/null +++ b/extensions/lang-english/locale/flarum-likes.yml @@ -0,0 +1,12 @@ +flarum-likes: + post_liked_notification: "{username} liked your post" + post_likes_modal_title: Users Who Like This + post_liked_by_self: "{users} like this." + post_liked_by: + one: "{users} likes this." + other: "{users} like this." + unlike_action: Unlike + like_action: Like + notify_post_liked: Someone likes my post + others: "{count} others" + you: You diff --git a/extensions/lang-english/locale/flarum-lock.yml b/extensions/lang-english/locale/flarum-lock.yml new file mode 100644 index 000000000..0dd5257f0 --- /dev/null +++ b/extensions/lang-english/locale/flarum-lock.yml @@ -0,0 +1,8 @@ +flarum-lock: + discussion_locked_notification: "{username} locked" + discussion_locked_post: "{username} locked the discussion." + discussion_unlocked_post: "{username} unlocked the discussion." + notify_discussion_locked: Someone locks a discussion I started + locked: Locked + lock: Lock + unlock: Unlock diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml new file mode 100644 index 000000000..878889f7c --- /dev/null +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -0,0 +1,10 @@ +flarum-mentions: + reply_to_post: "Reply to #{number}" + post_mentioned_notification: "{username} replied to your post" + others: "{count} others" + user_mentioned_notification: "{username} mentioned you" + post_mentioned_by: "{users} replied to this." + you: You + reply_link: Reply + notify_post_mentioned: Someone replies to my post + notify_user_mentioned: Someone mentions me in a post diff --git a/extensions/lang-english/locale/flarum-pusher.yml b/extensions/lang-english/locale/flarum-pusher.yml new file mode 100644 index 000000000..02293b8ee --- /dev/null +++ b/extensions/lang-english/locale/flarum-pusher.yml @@ -0,0 +1,4 @@ +flarum-pusher: + show_updated_discussions: + one: "Show {count} updated discussion" + other: "Show {count} updated discussions" diff --git a/extensions/lang-english/locale/flarum-sticky.yml b/extensions/lang-english/locale/flarum-sticky.yml new file mode 100644 index 000000000..ddedb71e9 --- /dev/null +++ b/extensions/lang-english/locale/flarum-sticky.yml @@ -0,0 +1,8 @@ +flarum-sticky: + discussion_stickied_notification: "{username} stickied" + discussion_stickied_post: "{username} stickied the discussion." + discussion_unstickied_post: "{username} unstickied the discussion." + notify_discussion_stickied: Someone stickies a discussion I started + stickied: Sticky + sticky: Sticky + unsticky: Unsticky diff --git a/extensions/lang-english/locale/flarum-subscriptions.yml b/extensions/lang-english/locale/flarum-subscriptions.yml new file mode 100644 index 000000000..7e326c154 --- /dev/null +++ b/extensions/lang-english/locale/flarum-subscriptions.yml @@ -0,0 +1,13 @@ +flarum-subscriptions: + following: Following + ignoring: Ignoring + follow: Follow + unfollow: Unfollow + ignore: Ignore + notify_new_post: Someone posts in a discussion I'm following + new_post_notification: "{username} posted" + not_following: Not Following + not_following_description: Be notified when @mentioned. + following_description: Be notified of all replies. + ignoring_description: Never be notified. Hide from the discussion list. + unignore: Unignore diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml new file mode 100644 index 000000000..66210308c --- /dev/null +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -0,0 +1,20 @@ +flarum-tags: + tags: Tags + discussion_tagged_post: + one: "{username} {action} tag." + other: "{username} {action} tags." + added_tags: "added the {tags}" + removed_tags: "removed the {tags}" + tag_new_discussion_title: Choose Tags for Your Discussion + tag_new_discussion_link: Choose Tags + edit_discussion_tags_title: "Edit Tags for {title}" + edit_discussion_tags_link: Edit Tags + choose_primary_tags: + one: Choose a primary tag + other: "Choose {count} primary tags" + choose_secondary_tags: + one: Choose 1 more tag + other: "Choose {count} more tags" + confirm: Confirm + more: More... + deleted: Deleted From 520d52a048c0046078ad48fd21638789c65bbbd0 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 3 Oct 2015 16:25:17 +0930 Subject: [PATCH 011/272] Update for composer branch, add svg icon --- extensions/lang-english/assets/icon.svg | 10 +++++++ extensions/lang-english/bootstrap.php | 36 ++++++++++++------------- extensions/lang-english/composer.json | 29 ++++++++++++++++++++ extensions/lang-english/flarum.json | 26 ------------------ 4 files changed, 56 insertions(+), 45 deletions(-) create mode 100644 extensions/lang-english/assets/icon.svg create mode 100644 extensions/lang-english/composer.json delete mode 100644 extensions/lang-english/flarum.json diff --git a/extensions/lang-english/assets/icon.svg b/extensions/lang-english/assets/icon.svg new file mode 100644 index 000000000..36c988974 --- /dev/null +++ b/extensions/lang-english/assets/icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/extensions/lang-english/bootstrap.php b/extensions/lang-english/bootstrap.php index 54888ef87..db331d086 100644 --- a/extensions/lang-english/bootstrap.php +++ b/extensions/lang-english/bootstrap.php @@ -1,31 +1,31 @@ listen(RegisterLocales::class, function(RegisterLocales $event) { - $locale = $name = null; +return function (Application $app) { + $app->make('events')->listen(RegisterLocales::class, function(RegisterLocales $event) { + $name = $title = basename(__DIR__); - if (file_exists($manifest = __DIR__.'/flarum.json')) { + if (file_exists($manifest = __DIR__.'/composer.json')) { $json = json_decode(file_get_contents($manifest), true); - $locale = array_key_exists('locale', $json) ? $json['locale'] : null; - $name = array_key_exists('name', $json) ? $json['name'] : null; - unset($json); + + if (empty($json)) { + throw new RuntimeException("Error parsing composer.json in $name: ".json_last_error_msg()); + } + + $locale = array_get($json, 'extra.flarum-locale.code'); + $title = array_get($json, 'extra.flarum-locale.title', $title); } - if ($name === null) { - throw new RuntimeException("Language pack ".__DIR__." needs a \"name\" in flarum.json."); + if (! isset($locale)) { + throw new RuntimeException("Language pack $name must define \"extra.flarum-locale.code\" in composer.json."); } - if ($locale === null) { - throw new RuntimeException("Language pack {$name} needs a \"locale\" in flarum.json."); - } - - $event->addLocale($locale, $name); + $event->addLocale($locale, $title); if (! is_dir($localeDir = __DIR__.'/locale')) { - throw new RuntimeException("Language pack {$name} needs a \"locale\" subdirectory."); + throw new RuntimeException("Language pack $name must have a \"locale\" subdirectory."); } if (file_exists($file = $localeDir.'/config.js')) { @@ -36,9 +36,7 @@ return function (Dispatcher $events) { $event->addConfig($locale, $file); } - $files = new DirectoryIterator($localeDir); - - foreach ($files as $file) { + foreach (new DirectoryIterator($localeDir) as $file) { if ($file->isFile() && in_array($file->getExtension(), ['yml', 'yaml'])) { $event->addTranslations($locale, $file->getPathname()); } diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json new file mode 100644 index 000000000..2a489aad3 --- /dev/null +++ b/extensions/lang-english/composer.json @@ -0,0 +1,29 @@ +{ + "name": "flarum/english", + "type": "flarum-extension", + "description": "English language pack.", + "license": "MIT", + "require": { + "composer/installers": "dev-master" + }, + "extra": { + "flarum-extension": { + "title": "English", + "icon": { + "backgroundImage": "url('{$assets}/icon.svg')", + "backgroundSize": "cover", + "backgroundPosition": "center" + } + }, + "flarum-locale": { + "code": "en", + "title": "English" + } + }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/tobscure/installers" + } + ] +} diff --git a/extensions/lang-english/flarum.json b/extensions/lang-english/flarum.json deleted file mode 100644 index ba6fddadb..000000000 --- a/extensions/lang-english/flarum.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "english", - "title": "English", - "locale": "en", - "description": "English language pack.", - "keywords": ["language"], - "version": "0.1.0-beta.3", - "author": { - "name": "Toby Zerner", - "email": "toby@flarum.org", - "homepage": "http://tobyzerner.com" - }, - "license": "MIT", - "require": { - "flarum": ">=0.1.0-beta.3" - }, - "support": { - "source": "https://github.com/flarum/english", - "issues": "https://github.com/flarum/core/issues" - }, - "icon": { - "name": "language", - "backgroundColor": "#eee", - "color": "#000" - } -} From 766bdb3cbb3a6095840ba587a135a44093b071d1 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 3 Oct 2015 17:37:04 +0930 Subject: [PATCH 012/272] Remove unnecessary information from composer.json --- extensions/lang-english/composer.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 2a489aad3..804188cf3 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -19,11 +19,5 @@ "code": "en", "title": "English" } - }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/tobscure/installers" - } - ] + } } From 89ab96ae153ad34e88d57aa1d468fb2bb07d76c7 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Tue, 6 Oct 2015 12:14:05 +0900 Subject: [PATCH 013/272] Update core YML with extracted strings See flarum/core#265 - Fixes namespacing of reorganized core keys (flarum/core#563) - Includes strings for the admin interface (flarum/core#575) - Includes a couple of leftover core strings (flarum/core#577) --- extensions/lang-english/locale/core.yml | 427 +++++++++++++++--------- 1 file changed, 265 insertions(+), 162 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index d7bc7e0ca..51ca4a53f 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -4,190 +4,299 @@ core: # UNIQUE KEYS - The following keys are used in only one location each. ## - # These strings are used in the Change Email modal dialog. - change_email_confirmation_message: => core.confirmation_email_sent - change_email_dismiss_button: => core.okay - change_email_submit_button: => core.save_changes - change_email_title: => core.change_email + # Strings in this namespace are used by the forum user interface. + forum: - # These strings are used in the Change Password modal dialog. - change_password_send_button: Send Password Reset Email - change_password_text: Click the button below and check your email for a link to change your password. - change_password_title: => core.change_password + # These strings are used in the Change Email modal dialog. + change_email_confirmation_message: => core.confirmation_email_sent + change_email_dismiss_button: => core.okay + change_email_submit_button: => core.save_changes + change_email_title: => core.change_email - # These strings are used by the Composer controls. - composer_close_tooltip: Close - composer_exit_full_screen_tooltip: Exit Full Screen - composer_full_screen_tooltip: Full Screen - composer_minimize_tooltip: Minimize + # These strings are used in the Change Password modal dialog. + change_password_send_button: Send Password Reset Email + change_password_text: Click the button below and check your email for a link to change your password. + change_password_title: => core.change_password - # These strings are used by the Composer when starting a discussion. - composer_discussion_body_placeholder: Write a Post... - composer_discussion_discard_confirmation: You have not posted your discussion. Do you wish to discard it? - composer_discussion_submit_button: Post Discussion - composer_discussion_title_placeholder: Discussion Title + # These strings are used by the composer controls. + composer_close_tooltip: Close + composer_exit_full_screen_tooltip: Exit Full Screen + composer_full_screen_tooltip: Full Screen + composer_minimize_tooltip: Minimize - # These strings are used by the Composer when editing a post. - composer_edit_discard_confirmation: You have not saved your changes. Do you wish to discard them? - composer_edit_post_link: "Post #{number} in {discussion}" - composer_edit_submit_button: => core.save_changes + # These strings are used by the composer when starting a discussion. + composer_discussion_body_placeholder: Write a Post... + composer_discussion_discard_confirmation: You have not posted your discussion. Do you wish to discard it? + composer_discussion_submit_button: Post Discussion + composer_discussion_title_placeholder: Discussion Title - # These strings are used by the Composer when replying to a discussion. - composer_reply_body_placeholder: => core.write_a_reply - composer_reply_discard_confirmation: You have not posted your reply. Do you wish to discard it? - composer_reply_posted_message: Your reply was posted. - composer_reply_submit_button: Post Reply - composer_reply_view_button: View + # These strings are used by the composer when editing a post. + composer_edit_discard_confirmation: You have not saved your changes. Do you wish to discard them? + composer_edit_post_link: "Post #{number} in {discussion}" + composer_edit_submit_button: => core.save_changes - # These strings are used by the discussion control buttons. - discussion_controls_cannot_reply_button: Can't Reply - discussion_controls_cannot_reply_text: You don't have permission to reply to this discussion. - discussion_controls_delete_button: => core.delete - discussion_controls_delete_confirmation: Are you sure you want to delete this discussion? - discussion_controls_delete_forever_button: => core.delete_forever - discussion_controls_log_in_to_reply_button: Log In to Reply - discussion_controls_rename_button: Rename - discussion_controls_rename_text: Enter a new title for this discussion: - discussion_controls_reply_button: Reply - discussion_controls_restore_button: => core.restore + # These strings are used by the composer when replying to a discussion. + composer_reply_body_placeholder: => core.write_a_reply + composer_reply_discard_confirmation: You have not posted your reply. Do you wish to discard it? + composer_reply_posted_message: Your reply was posted. + composer_reply_submit_button: Post Reply + composer_reply_view_button: View - # These strings are used in the discussion list. - discussion_list_load_more_button: => core.load_more - discussion_list_mark_as_read_tooltip: Mark as Read - discussion_list_replied_text: "{username} replied {ago}" - discussion_list_started_text: "{username} started {ago}" + # These strings are used by the discussion control buttons. + discussion_controls_cannot_reply_button: Can't Reply + discussion_controls_cannot_reply_text: You don't have permission to reply to this discussion. + discussion_controls_delete_button: => core.delete + discussion_controls_delete_confirmation: Are you sure you want to delete this discussion? + discussion_controls_delete_forever_button: => core.delete_forever + discussion_controls_log_in_to_reply_button: Log In to Reply + discussion_controls_rename_button: Rename + discussion_controls_rename_text: Enter a new title for this discussion: + discussion_controls_reply_button: Reply + discussion_controls_restore_button: => core.restore - # These strings are used in the Edit User modal dialog (moderator function). - edit_user_email_label: => core.email - edit_user_password_label: => core.password - edit_user_submit_button: => core.save_changes - edit_user_username_label: => core.username + # These strings are used in the discussion list. + discussion_list_empty_text: Looks like there are no discussions here. Why don't you create a new one? + discussion_list_load_more_button: => core.load_more + discussion_list_mark_as_read_tooltip: Mark as Read + discussion_list_replied_text: "{username} replied {ago}" + discussion_list_started_text: "{username} started {ago}" - # These strings are used in the Forgot Password modal dialog. - forgot_password_dismiss_button: => core.okay - forgot_password_email_placeholder: => core.email - forgot_password_email_sent_message: We've sent you an email containing a link to reset your password. Check your spam folder if you don't receive it within the next minute or two. - forgot_password_submit_button: Recover Password - forgot_password_text: Enter your email address and we will send you a link to reset your password. - forgot_password_title: Forgot Password + # These strings are used in the Edit User modal dialog (admin function). + edit_user_email_label: => core.email + edit_user_password_label: => core.password + edit_user_submit_button: => core.save_changes + edit_user_username_label: => core.username - # These strings are used in the header and session dropdown menu. - header_admin_button: Administration - header_log_in_link: => core.log_in - header_log_out_button: Log Out - header_profile_button: Profile - header_search_placeholder: Search Forum - header_settings_button: => core.settings - header_sign_up_link: => core.sign_up + # These strings are used in the Forgot Password modal dialog. + forgot_password_dismiss_button: => core.okay + forgot_password_email_placeholder: => core.email + forgot_password_email_sent_message: We've sent you an email containing a link to reset your password. Check your spam folder if you don't receive it within the next minute or two. + forgot_password_submit_button: Recover Password + forgot_password_text: Enter your email address and we will send you a link to reset your password. + forgot_password_title: Forgot Password - # These strings are used on the index page, peripheral to the discussion list. - index_all_discussions_link: All Discussions - index_cannot_start_discussion_button: "Can't Start Discussion" - index_mark_all_as_read_tooltip: => core.mark_all_as_read - index_refresh_tooltip: Refresh - index_start_discussion_button: Start a Discussion + # These strings are used in the header and session dropdown menu. + header_admin_button: Administration + header_log_in_link: => core.log_in + header_log_out_button: => core.log_out + header_profile_button: Profile + header_search_placeholder: Search Forum + header_settings_button: => core.settings + header_sign_up_link: => core.sign_up - # These strings are used by the sorting control above the discussion list. - index_sort_latest_button: Latest - index_sort_newest_button: Newest - index_sort_oldest_button: Oldest - index_sort_relevance_button: Relevance - index_sort_top_button: Top + # These strings are used on the index page, peripheral to the discussion list. + index_all_discussions_link: => core.all_discussions + index_cannot_start_discussion_button: Can't Start Discussion + index_mark_all_as_read_tooltip: => core.mark_all_as_read + index_refresh_tooltip: Refresh + index_start_discussion_button: Start a Discussion - # These strings are used in the Log In modal dialog. - log_in_confirmation_required_message: "You need to confirm your email before you can log in. We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." - log_in_forgot_password_link: Forgot password? - log_in_invalid_login_message: Your login details were incorrect. - log_in_no_account_text: "Don't have an account? " # Final space is needed for string separation. - log_in_password_placeholder: => core.password - log_in_sign_up_link: => core.sign_up - log_in_submit_button: => core.log_in - log_in_title: => core.log_in - log_in_username_or_email_placeholder: Username or Email + # These strings are used by the sorting control above the discussion list. + index_sort_latest_button: Latest + index_sort_newest_button: Newest + index_sort_oldest_button: Oldest + index_sort_relevance_button: Relevance + index_sort_top_button: Top - # These strings are used by the Notifications dropdown, a.k.a. "the bell". - notifications_discussion_renamed_text: "{username} changed the title" - notifications_empty_text: No Notifications - notifications_mark_all_as_read_tooltip: => core.mark_all_as_read - notifications_title: => core.notifications - notifications_tooltip: => core.notifications + # These strings are used in the Log In modal dialog. + log_in_confirmation_required_message: "You need to confirm your email before you can log in. We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." + log_in_forgot_password_link: Forgot password? + log_in_invalid_login_message: Your login details were incorrect. + log_in_password_placeholder: => core.password + log_in_sign_up_text: "Don't have an account? Log In" + log_in_submit_button: => core.log_in + log_in_title: => core.log_in + log_in_username_or_email_placeholder: Username or Email - # These strings are used by tooltips displayed for individual posts. - post_edited_tooltip: "{username} edited {ago}" - post_number_tooltip: "Post #{number}" + # These strings are used by the Notifications dropdown, a.k.a. "the bell". + notifications_discussion_renamed_text: "{username} changed the title" + notifications_empty_text: No Notifications + notifications_mark_all_as_read_tooltip: => core.mark_all_as_read + notifications_title: => core.notifications + notifications_tooltip: => core.notifications - # These strings are used by the post control buttons. - post_controls_delete_button: => core.delete - post_controls_delete_forever_button: => core.delete_forever - post_controls_edit_button: => core.edit - post_controls_restore_button: => core.restore + # These strings are used by tooltips displayed for individual posts. + post_edited_tooltip: "{username} edited {ago}" + post_number_tooltip: "Post #{number}" - # These strings are used in the scrubber to the right of the post stream. - post_scrubber_now_link: Now - post_scrubber_original_post_link: Original Post - post_scrubber_unread_text: "{count} unread" - post_scrubber_viewing_text: - one: "{index} of {count} post" - other: "{index} of {count} posts" + # These strings are used by the post control buttons. + post_controls_delete_button: => core.delete + post_controls_delete_forever_button: => core.delete_forever + post_controls_edit_button: => core.edit + post_controls_restore_button: => core.restore - # These strings are displayed between posts in the post stream. - post_stream_discussion_renamed_text: "{username} changed the title from {old} to {new}." - post_stream_reply_placeholder: => core.write_a_reply - post_stream_time_lapsed_text: "{period} later" + # These strings are used in the scrubber to the right of the post stream. + post_scrubber_now_link: Now + post_scrubber_original_post_link: Original Post + post_scrubber_unread_text: "{count} unread" + post_scrubber_viewing_text: + one: "{index} of {count} post" + other: "{index} of {count} posts" - # These strings are used by the search results dropdown list. - search_all_discussions_button: 'Search all discussions for "{query}"' - search_discussions_heading: => core.discussions - search_users_heading: Users + # These strings are displayed between posts in the post stream. + post_stream_discussion_renamed_text: "{username} changed the title from {old} to {new}." + post_stream_reply_placeholder: => core.write_a_reply + post_stream_time_lapsed_text: "{period} later" - # These strings are used in the Settings page. - settings_account_heading: Account - settings_change_email_button: => core.change_email - settings_change_password_button: => core.change_password - settings_notifications_heading: => core.notifications - settings_privacy_disclose_online_label: Allow others to see when I am online - settings_privacy_heading: Privacy - settings_title: => core.settings + # These strings are used by the search results dropdown list. + search_all_discussions_button: 'Search all discussions for "{query}"' + search_discussions_heading: => core.discussions + search_users_heading: Users - # These strings are used in the Notifications grid on the Settings page. - settings_notify_by_email_heading: => core.email - settings_notify_by_web_heading: Web - settings_notify_discussion_renamed_label: Someone renames a discussion I started + # These strings are used in the Settings page. + settings_account_heading: Account + settings_change_email_button: => core.change_email + settings_change_password_button: => core.change_password + settings_notifications_heading: => core.notifications + settings_privacy_disclose_online_label: Allow others to see when I am online + settings_privacy_heading: Privacy + settings_title: => core.settings - # These strings are used in the Sign Up modal dialog. - sign_up_already_have_account_text: "Already have an account? " # Final space is needed for string separation. - sign_up_confirmation_message: => core.confirmation_email_sent - sign_up_email_placeholder: => core.email - sign_up_dismiss_button: => core.okay - sign_up_log_in_link: => core.log_in - sign_up_password_placeholder: => core.password - sign_up_submit_button: => core.sign_up - sign_up_title: => core.sign_up - sign_up_username_placeholder: => core.username - sign_up_welcome_text: "Welcome, {username}!" + # These strings are used in the Notifications grid on the Settings page. + settings_notify_by_email_heading: => core.email + settings_notify_by_web_heading: Web + settings_notify_discussion_renamed_label: Someone renames a discussion I started - # These strings are used in the user profile page and profile popup. - user_bio_placeholder: Write something about yourself - user_discussions_link: => core.discussions - user_joined_date_text: "Joined {ago}" - user_online_text: Online - user_posts_load_more_button: => core.load_more - user_posts_link: Posts - user_settings_link: => core.settings + # These strings are used in the Sign Up modal dialog. + sign_up_confirmation_message: => core.confirmation_email_sent + sign_up_email_placeholder: => core.email + sign_up_dismiss_button: => core.okay + sign_up_log_in_text: => "Already have an account? Sign Up" + sign_up_password_placeholder: => core.password + sign_up_submit_button: => core.sign_up + sign_up_title: => core.sign_up + sign_up_username_placeholder: => core.username + sign_up_welcome_text: "Welcome, {username}!" - # These strings are used to control the avatar in the user profile page. - user_avatar_remove_button: Remove - user_avatar_upload_button: Upload + # These strings are used in the user profile page and profile popup. + user_bio_placeholder: Write something about yourself + user_deleted_text: "[deleted]" + user_discussions_link: => core.discussions + user_joined_date_text: "Joined {ago}" + user_online_text: Online + user_posts_load_more_button: => core.load_more + user_posts_link: Posts + user_settings_link: => core.settings - # These strings are found on the user profile page (moderator function). - user_controls_button: Controls - user_controls_delete_button: => core.delete - user_controls_edit_button: => core.edit + # These strings are used to control the avatar in the user profile page. + user_avatar_remove_button: Remove + user_avatar_upload_button: Upload + + # These strings are found on the user profile page (admin function). + user_controls_button: Controls + user_controls_delete_button: => core.delete + user_controls_delete_confirmation: Are you sure you want to delete this user? All of the user's posts will be deleted. + user_controls_edit_button: => core.edit + + # Strings in this namespace are used by the admin interface. + admin: + + # These strings are used in the Appearance page. + appearance_colored_header_label: Colored Header + appearance_colors_heading: Colors + appearance_colors_text: Choose two colors to theme your forum with. The first will be used as a highlight color, while the second will be used to style background elements. + appearance_custom_styles_heading: Custom Styles + appearance_custom_styles_text: Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles. + appearance_dark_mode_label: Dark Mode + appearance_edit_css_button: Edit Custom CSS + appearance_enter_hex_message: Please enter a hexadecimal color code. + appearance_submit_button: => core.save_changes + + # These strings are used in the Basics page. + basics_all_discussions_label: => core.all_discussions + basics_default_language_heading: Default Language + basics_forum_description_heading: Forum Description + basics_forum_description_text: Enter a short sentence or two that describes your community. This will appear in the meta tag and show up in search engines. + basics_forum_title_heading: Forum Title + basics_home_page_heading: Home Page + basics_home_page_text: Choose the page which users will first see when they visit your forum. If entering a custom value, use the path relative to the forum root. + basics_saved_message: Your changes were saved. + basics_submit_button: => core.save_changes + basics_welcome_banner_heading: Welcome Banner + basics_welcome_banner_text: Configure the text that displays in the banner on the All Discussions page. Use this to welcome guests to your forum. + + # These strings are used in the Dashboard page. + dashboard_beta_warning_text: "This beta software is provided primarily so that you can help us test it and make it better; it should not be used in production." + dashboard_contributing_text: "Want to look for bugs and contribute? Read the Contributing docs." + dashboard_extension_text: "Interested in developing extensions? Read the Extension docs." + dashboard_features_text: "Got an idea to improve a feature? Tell us about it under the Features tag." + dashboard_support_text: "Found a bug? Please report it in our forum, under the Support tag." + dashboard_troubleshooting_text: "Having problems? Follow the instructions in the Troubleshooting docs." + dashboard_version_text: "Thanks for trying out Flarum! You are running version {version}." + + # These strings are used in the Edit Group modal dialog. + edit_group_color_label: Color + edit_group_delete_button: Delete Group + edit_group_delete_confirmation: Are you sure you want to delete this group? The group members will NOT be deleted. + edit_group_icon_label: Icon + edit_group_icon_text: "Enter the name of any FontAwesome icon class, without the fa- prefix." + edit_group_name_label: Name + edit_group_plural_placeholder: Plural (e.g. Mods) + edit_group_singular_placeholder: Singular (e.g. Mod) + edit_group_submit_button: => core.save_changes + edit_group_title: Create Group + + # These strings are used in the Extensions page. + extensions_add_button: Add Extension + extensions_disable_button: Disable + extensions_enable_button: Enable + extensions_settings_button: => core.settings + extensions_uninstall_button: Uninstall + + # This string is used in the Extensions loading modal dialog. + extensions_loading_title: Please Wait... + + # This string is used in the session dropdown menu. + header_log_out_button: => core.log_out + + # These strings are used in the navigation bar. + nav_appearance_button: Appearance + nav_appearance_text: Customize your forum's colors, logos, and other variables. + nav_basics_button: Basics + nav_basics_text: Set your forum title, language, and other basic settings. + nav_dashboard_button: Dashboard + nav_dashboard_text: Your forum at a glance. + nav_extensions_button: Extensions + nav_extensions_text: Add extra functionality to your forum and make it your own. + nav_permissions_button: Permissions + nav_permissions_text: Configure who can see and do what. + + # These strings are used in the Permissions page of the admin interface. + permissions_allow_indefinitely_button: Indefinitely + permissions_allow_renaming_label: Allow renaming + permissions_allow_post_editing_label: Allow post editing + permissions_allow_some_minutes_button: + one: "For {count} minute" + other: "For {count} minutes" + permissions_allow_ten_minutes_button: For 10 minutes + permissions_allow_until_reply_button: Until next reply + permissions_create_heading: Create + permissions_delete_discussions_forever_label: Delete discussions forever + permissions_delete_discussions_label: Delete discussions + permissions_delete_posts_forever_label: Delete posts forever + permissions_edit_and_delete_posts_label: Edit and delete posts + permissions_global_heading: Global + permissions_moderate_heading: Moderate + permissions_new_group_button: New Group + permissions_participate_heading: Participate + permissions_read_heading: Read + permissions_rename_discussions_label: Rename discussions + permissions_reply_to_discussions_label: Reply to discussions + permissions_signup_closed_button: Closed + permissions_signup_open_button: Open + permissions_sign_up_label: Sign up + permissions_start_discussions_label: Start discussions + permissions_view_discussions_label: View discussions + + # These strings are used in the dropdown menus on the Permissions page. + permissions_dropdown_everyone_button: Everyone + permissions_dropdown_members_button: Members ## # REUSED STRINGS - The following keys are referenced by two or more unique keys. ## + all_discussions: All Discussions change_email: Change Email change_password: Change Password confirmation_email_sent: "We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." @@ -198,6 +307,7 @@ core: email: Email load_more: Load More log_in: Log In + log_out: Log Out mark_all_as_read: Mark All as Read notifications: Notifications okay: OK @@ -210,13 +320,9 @@ core: write_a_reply: Write a Reply... ## - # GLOBAL STRINGS - Keys in this section are used globally (or generated automatically). + # DEFAULT GROUP NAMES - Translations for the forum's default language are used. ## - # This string replaces a deleted username: - deleted_username: "[deleted]" - - # The following keys are generated from group names: group_admin: Admin group_admins: Admins group_guest: Guest @@ -225,6 +331,3 @@ core: group_members: Members group_mod: Mod group_mods: Mods - - # This string is currently unused: - powered_by_flarum: Powered by Flarum From c98444382daec275373ef370f32de24063d2660a Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 7 Oct 2015 23:01:00 +1030 Subject: [PATCH 014/272] Update icon API --- extensions/lang-english/composer.json | 5 +---- extensions/lang-english/{assets => }/icon.svg | 0 2 files changed, 1 insertion(+), 4 deletions(-) rename extensions/lang-english/{assets => }/icon.svg (100%) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 804188cf3..3103bf05d 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -3,14 +3,11 @@ "type": "flarum-extension", "description": "English language pack.", "license": "MIT", - "require": { - "composer/installers": "dev-master" - }, "extra": { "flarum-extension": { "title": "English", "icon": { - "backgroundImage": "url('{$assets}/icon.svg')", + "image": "icon.svg", "backgroundSize": "cover", "backgroundPosition": "center" } diff --git a/extensions/lang-english/assets/icon.svg b/extensions/lang-english/icon.svg similarity index 100% rename from extensions/lang-english/assets/icon.svg rename to extensions/lang-english/icon.svg From 4be8270c1a0e403596abde9643ec44b15f18fb57 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 7 Oct 2015 23:07:44 +1030 Subject: [PATCH 015/272] Update APIs --- extensions/lang-english/bootstrap.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions/lang-english/bootstrap.php b/extensions/lang-english/bootstrap.php index db331d086..3444149b1 100644 --- a/extensions/lang-english/bootstrap.php +++ b/extensions/lang-english/bootstrap.php @@ -1,10 +1,10 @@ make('events')->listen(RegisterLocales::class, function(RegisterLocales $event) { +return function (Dispatcher $events) { + $events->listen(ConfigureLocales::class, function(ConfigureLocales $event) { $name = $title = basename(__DIR__); if (file_exists($manifest = __DIR__.'/composer.json')) { @@ -22,23 +22,23 @@ return function (Application $app) { throw new RuntimeException("Language pack $name must define \"extra.flarum-locale.code\" in composer.json."); } - $event->addLocale($locale, $title); + $event->locales->addLocale($locale, $title); if (! is_dir($localeDir = __DIR__.'/locale')) { throw new RuntimeException("Language pack $name must have a \"locale\" subdirectory."); } if (file_exists($file = $localeDir.'/config.js')) { - $event->addJsFile($locale, $file); + $event->locales->addJsFile($locale, $file); } if (file_exists($file = $localeDir.'/config.php')) { - $event->addConfig($locale, $file); + $event->locales->addConfig($locale, $file); } foreach (new DirectoryIterator($localeDir) as $file) { if ($file->isFile() && in_array($file->getExtension(), ['yml', 'yaml'])) { - $event->addTranslations($locale, $file->getPathname()); + $event->locales->addTranslations($locale, $file->getPathname()); } } }); From 6192901bc523a041a5b194d4ef3b27d2f44c0ccf Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 8 Oct 2015 22:50:13 +1030 Subject: [PATCH 016/272] Simplify gitignore No need to try and cover everything, people can add global gitignore rules if their OS is generating weird files. --- extensions/lang-english/.gitignore | 42 +++--------------------------- 1 file changed, 3 insertions(+), 39 deletions(-) diff --git a/extensions/lang-english/.gitignore b/extensions/lang-english/.gitignore index 7f2c67c26..a4f3b125e 100644 --- a/extensions/lang-english/.gitignore +++ b/extensions/lang-english/.gitignore @@ -1,40 +1,4 @@ -# Windows -Thumbs.db -ehthumbs.db -Desktop.ini -$RECYCLE.BIN/ -*.cab -*.msi -*.msm -*.msp -*.lnk - -# Mac OS +/vendor +composer.phar .DS_Store -.AppleDouble -.LSOverride -Icon -._* -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# Linux -*~ -.directory -.Trash-* - -# Backup and log files -*.bak -*.log - -# Git -.git +Thumbs.db From 8458b59e7819ccb20b784193c7ac6aa5f97fd63a Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 8 Oct 2015 22:50:28 +1030 Subject: [PATCH 017/272] Add translations for lib.series --- extensions/lang-english/locale/core.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 51ca4a53f..8605882c2 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -292,6 +292,14 @@ core: permissions_dropdown_everyone_button: Everyone permissions_dropdown_members_button: Members + # Strings in this namespace are used by the forum and admin interfaces. + lib: + + # These strings are used to punctuate a series of items. + series_glue_text: ", " + series_two_text: "{first} and {second}" + series_three_text: "{first}, {second}, and {third}" + ## # REUSED STRINGS - The following keys are referenced by two or more unique keys. ## From 14b97b8c15d4ddc212e842ab9911449fb4611ed8 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 12 Oct 2015 15:00:25 +1030 Subject: [PATCH 018/272] Update icon, metadata --- extensions/lang-english/composer.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 3103bf05d..613b0647e 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -2,12 +2,14 @@ "name": "flarum/english", "type": "flarum-extension", "description": "English language pack.", + "keywords": ["locale"], "license": "MIT", "extra": { "flarum-extension": { "title": "English", "icon": { "image": "icon.svg", + "backgroundColor": "#00247d", "backgroundSize": "cover", "backgroundPosition": "center" } From 74f7c2a1dbb9345ecf2124d3fd83ff06cd0ce1f5 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 14 Oct 2015 16:05:42 +1030 Subject: [PATCH 019/272] Fix typo in sign_up_log_in_text --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 8605882c2..b0d35976b 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -161,7 +161,7 @@ core: sign_up_confirmation_message: => core.confirmation_email_sent sign_up_email_placeholder: => core.email sign_up_dismiss_button: => core.okay - sign_up_log_in_text: => "Already have an account? Sign Up" + sign_up_log_in_text: "Already have an account? Sign Up" sign_up_password_placeholder: => core.password sign_up_submit_button: => core.sign_up sign_up_title: => core.sign_up From eff26abc6abea84a44023b46bc0bc998abaa809d Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 15 Oct 2015 22:37:00 +1030 Subject: [PATCH 020/272] Switch to new plural format Flarum is now powered by Symfony's Translation component, which has a more powerful pluralization system. The rules for all locales are included in core so they no longer need to be included per-language pack. See http://symfony.com/doc/current/components/translation/usage.html#pluralization to learn about the format. closes #550 --- extensions/lang-english/bootstrap.php | 4 ---- extensions/lang-english/locale/config.js | 5 ----- extensions/lang-english/locale/config.php | 9 --------- extensions/lang-english/locale/core.yml | 13 +++++-------- 4 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 extensions/lang-english/locale/config.js delete mode 100644 extensions/lang-english/locale/config.php diff --git a/extensions/lang-english/bootstrap.php b/extensions/lang-english/bootstrap.php index 3444149b1..5fdb1a099 100644 --- a/extensions/lang-english/bootstrap.php +++ b/extensions/lang-english/bootstrap.php @@ -32,10 +32,6 @@ return function (Dispatcher $events) { $event->locales->addJsFile($locale, $file); } - if (file_exists($file = $localeDir.'/config.php')) { - $event->locales->addConfig($locale, $file); - } - foreach (new DirectoryIterator($localeDir) as $file) { if ($file->isFile() && in_array($file->getExtension(), ['yml', 'yaml'])) { $event->locales->addTranslations($locale, $file->getPathname()); diff --git a/extensions/lang-english/locale/config.js b/extensions/lang-english/locale/config.js deleted file mode 100644 index c85996282..000000000 --- a/extensions/lang-english/locale/config.js +++ /dev/null @@ -1,5 +0,0 @@ -// See http://flarum.org/docs/localization to learn how this file works. - -app.translator.plural = function(count) { - return count == 1 ? 'one' : 'other'; -}; diff --git a/extensions/lang-english/locale/config.php b/extensions/lang-english/locale/config.php deleted file mode 100644 index b9cd84fef..000000000 --- a/extensions/lang-english/locale/config.php +++ /dev/null @@ -1,9 +0,0 @@ - function ($count) { - return $count == 1 ? 'one' : 'other'; - } -]; diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index b0d35976b..de896fe3d 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -103,7 +103,7 @@ core: log_in_forgot_password_link: Forgot password? log_in_invalid_login_message: Your login details were incorrect. log_in_password_placeholder: => core.password - log_in_sign_up_text: "Don't have an account? Log In" + log_in_sign_up_text: "Don't have an account? Sign Up" log_in_submit_button: => core.log_in log_in_title: => core.log_in log_in_username_or_email_placeholder: Username or Email @@ -129,9 +129,7 @@ core: post_scrubber_now_link: Now post_scrubber_original_post_link: Original Post post_scrubber_unread_text: "{count} unread" - post_scrubber_viewing_text: - one: "{index} of {count} post" - other: "{index} of {count} posts" + post_scrubber_viewing_text: "{index} of {count} post|{index} of {count} posts" # These strings are displayed between posts in the post stream. post_stream_discussion_renamed_text: "{username} changed the title from {old} to {new}." @@ -161,7 +159,7 @@ core: sign_up_confirmation_message: => core.confirmation_email_sent sign_up_email_placeholder: => core.email sign_up_dismiss_button: => core.okay - sign_up_log_in_text: "Already have an account? Sign Up" + sign_up_log_in_text: "Already have an account? Log In" sign_up_password_placeholder: => core.password sign_up_submit_button: => core.sign_up sign_up_title: => core.sign_up @@ -265,9 +263,7 @@ core: permissions_allow_indefinitely_button: Indefinitely permissions_allow_renaming_label: Allow renaming permissions_allow_post_editing_label: Allow post editing - permissions_allow_some_minutes_button: - one: "For {count} minute" - other: "For {count} minutes" + permissions_allow_some_minutes_button: "For {count} minute|For {count} minutes" permissions_allow_ten_minutes_button: For 10 minutes permissions_allow_until_reply_button: Until next reply permissions_create_heading: Create @@ -339,3 +335,4 @@ core: group_members: Members group_mod: Mod group_mods: Mods + From e6ee0ebeface7a5f95fa2620eb752fa62c9318d9 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 15 Oct 2015 22:38:17 +1030 Subject: [PATCH 021/272] Add validation translations These are the translations for Laravel's Validation component. They are in their own top-level namespace. Unlike the rest of Flarum's translations, the variables are marked by a :colon prefix rather than {curlies}. --- extensions/lang-english/locale/validation.yml | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 extensions/lang-english/locale/validation.yml diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml new file mode 100644 index 000000000..018946e3c --- /dev/null +++ b/extensions/lang-english/locale/validation.yml @@ -0,0 +1,69 @@ +validation: + accepted: "The :attribute must be accepted." + active_url: "The :attribute is not a valid URL." + after: "The :attribute must be a date after :date." + alpha: "The :attribute may only contain letters." + alpha_dash: "The :attribute may only contain letters, numbers, and dashes." + alpha_num: "The :attribute may only contain letters and numbers." + array: "The :attribute must be an array." + before: "The :attribute must be a date before :date." + between: + numeric: "The :attribute must be between :min and :max." + file: "The :attribute must be between :min and :max kilobytes." + string: "The :attribute must be between :min and :max characters." + array: "The :attribute must have between :min and :max items." + boolean: "The :attribute field must be true or false." + confirmed: "The :attribute confirmation does not match." + date: "The :attribute is not a valid date." + date_format: "The :attribute does not match the format :other." + different: "The :attribute and :other must be different." + digits: "The :attribute must be :digits digits." + digits_between: "The :attribute must be between :min and :max digits." + email: "The :attribute must be a valid email address." + exists: "The selected :attribute is invalid." + filled: "The :attribute field is required." + image: "The :attribute must be an image." + in: "The selected :attribute is invalid." + integer: "The :attribute must be an integer." + ip: "The :attribute must be a valid IP address." + json: "The :attribute must be a valid JSON string." + max: + numeric: "The :attribute may not be greater than :max." + file: "The :attribute may not be greater than :max kilobytes." + string: "The :attribute may not be greater than :max characters." + array: "The :attribute may not have more than :max items." + mimes: "The :attribute must be a file of type: :values." + min: + numeric: "The :attribute must be at least :min." + file: "The :attribute must be at least :min kilobytes." + string: "The :attribute must be at least :min characters." + array: "The :attribute must have at least :min items." + not_in: "The selected :attribute is invalid." + numeric: "The :attribute must be a number." + regex: "The :attribute format is invalid." + required: "The :attribute field is required." + required_if: "The :attribute field is required when :other is :value." + required_with: "The :attribute field is required when :values is present." + required_with_all: "The :attribute field is required when :values is present." + required_without: "The :attribute field is required when :values is not present." + required_without_all: "The :attribute field is required when none of :values are present." + same: "The :attribute and :other must match." + size: + numeric: "The :attribute must be :size." + file: "The :attribute must be :size kilobytes." + string: "The :attribute must be :size characters." + array: "The :attribute must contain :size items." + string: "The :attribute must be a string." + timezone: "The :attribute must be a valid zone." + unique: "The :attribute has already been taken." + url: "The :attribute format is invalid." + + attributes: + username: username + password: password + email: email + title: title + content: content + name_singular: singular name + name_plural: plural name + From 1f5269d8740c52fbb4ac9916d73b26406ff5a97f Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 16 Oct 2015 12:35:05 +1030 Subject: [PATCH 022/272] Namespace extension translations Also update with the new plural syntax --- .../lang-english/locale/flarum-flags.yml | 15 +++++---- .../lang-english/locale/flarum-likes.yml | 21 ++++++------ .../lang-english/locale/flarum-lock.yml | 15 +++++---- .../lang-english/locale/flarum-mentions.yml | 19 ++++++----- .../lang-english/locale/flarum-pusher.yml | 5 ++- .../lang-english/locale/flarum-sticky.yml | 15 +++++---- .../locale/flarum-subscriptions.yml | 25 +++++++------- .../lang-english/locale/flarum-tags.yml | 33 ++++++++----------- 8 files changed, 73 insertions(+), 75 deletions(-) diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml index 890f5b5c0..c322050a5 100644 --- a/extensions/lang-english/locale/flarum-flags.yml +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -1,8 +1,9 @@ flarum-flags: - reason_off_topic: Off-topic - reason_spam: Spam - reason_inappropriate: Inappropriate - reason_other: Other - flagged_by: "{username} flagged" - flagged_by_with_reason: "{username} flagged as {reason}" - no_flags: No Flags + forum: + reason_off_topic: Off-topic + reason_spam: Spam + reason_inappropriate: Inappropriate + reason_other: Other + flagged_by: "{username} flagged" + flagged_by_with_reason: "{username} flagged as {reason}" + no_flags: No Flags diff --git a/extensions/lang-english/locale/flarum-likes.yml b/extensions/lang-english/locale/flarum-likes.yml index 73736b968..de5198ef2 100644 --- a/extensions/lang-english/locale/flarum-likes.yml +++ b/extensions/lang-english/locale/flarum-likes.yml @@ -1,12 +1,11 @@ flarum-likes: - post_liked_notification: "{username} liked your post" - post_likes_modal_title: Users Who Like This - post_liked_by_self: "{users} like this." - post_liked_by: - one: "{users} likes this." - other: "{users} like this." - unlike_action: Unlike - like_action: Like - notify_post_liked: Someone likes my post - others: "{count} others" - you: You + forum: + post_liked_notification: "{username} liked your post" + post_likes_modal_title: Users Who Like This + post_liked_by_self: "{users} like this." + post_liked_by: "{users} likes this.|{users} like this." + unlike_action: Unlike + like_action: Like + notify_post_liked: Someone likes my post + others: "{count} others" + you: You diff --git a/extensions/lang-english/locale/flarum-lock.yml b/extensions/lang-english/locale/flarum-lock.yml index 0dd5257f0..3aa1e344d 100644 --- a/extensions/lang-english/locale/flarum-lock.yml +++ b/extensions/lang-english/locale/flarum-lock.yml @@ -1,8 +1,9 @@ flarum-lock: - discussion_locked_notification: "{username} locked" - discussion_locked_post: "{username} locked the discussion." - discussion_unlocked_post: "{username} unlocked the discussion." - notify_discussion_locked: Someone locks a discussion I started - locked: Locked - lock: Lock - unlock: Unlock + forum: + discussion_locked_notification: "{username} locked" + discussion_locked_post: "{username} locked the discussion." + discussion_unlocked_post: "{username} unlocked the discussion." + notify_discussion_locked: Someone locks a discussion I started + locked: Locked + lock: Lock + unlock: Unlock diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml index 878889f7c..6e30e4119 100644 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -1,10 +1,11 @@ flarum-mentions: - reply_to_post: "Reply to #{number}" - post_mentioned_notification: "{username} replied to your post" - others: "{count} others" - user_mentioned_notification: "{username} mentioned you" - post_mentioned_by: "{users} replied to this." - you: You - reply_link: Reply - notify_post_mentioned: Someone replies to my post - notify_user_mentioned: Someone mentions me in a post + forum: + reply_to_post: "Reply to #{number}" + post_mentioned_notification: "{username} replied to your post" + others: "{count} others" + user_mentioned_notification: "{username} mentioned you" + post_mentioned_by: "{users} replied to this." + you: You + reply_link: Reply + notify_post_mentioned: Someone replies to my post + notify_user_mentioned: Someone mentions me in a post diff --git a/extensions/lang-english/locale/flarum-pusher.yml b/extensions/lang-english/locale/flarum-pusher.yml index 02293b8ee..650ab7abf 100644 --- a/extensions/lang-english/locale/flarum-pusher.yml +++ b/extensions/lang-english/locale/flarum-pusher.yml @@ -1,4 +1,3 @@ flarum-pusher: - show_updated_discussions: - one: "Show {count} updated discussion" - other: "Show {count} updated discussions" + forum: + show_updated_discussions: "Show {count} updated discussion|Show {count} updated discussions" diff --git a/extensions/lang-english/locale/flarum-sticky.yml b/extensions/lang-english/locale/flarum-sticky.yml index ddedb71e9..916133cff 100644 --- a/extensions/lang-english/locale/flarum-sticky.yml +++ b/extensions/lang-english/locale/flarum-sticky.yml @@ -1,8 +1,9 @@ flarum-sticky: - discussion_stickied_notification: "{username} stickied" - discussion_stickied_post: "{username} stickied the discussion." - discussion_unstickied_post: "{username} unstickied the discussion." - notify_discussion_stickied: Someone stickies a discussion I started - stickied: Sticky - sticky: Sticky - unsticky: Unsticky + forum: + discussion_stickied_notification: "{username} stickied" + discussion_stickied_post: "{username} stickied the discussion." + discussion_unstickied_post: "{username} unstickied the discussion." + notify_discussion_stickied: Someone stickies a discussion I started + stickied: Sticky + sticky: Sticky + unsticky: Unsticky diff --git a/extensions/lang-english/locale/flarum-subscriptions.yml b/extensions/lang-english/locale/flarum-subscriptions.yml index 7e326c154..c9540f950 100644 --- a/extensions/lang-english/locale/flarum-subscriptions.yml +++ b/extensions/lang-english/locale/flarum-subscriptions.yml @@ -1,13 +1,14 @@ flarum-subscriptions: - following: Following - ignoring: Ignoring - follow: Follow - unfollow: Unfollow - ignore: Ignore - notify_new_post: Someone posts in a discussion I'm following - new_post_notification: "{username} posted" - not_following: Not Following - not_following_description: Be notified when @mentioned. - following_description: Be notified of all replies. - ignoring_description: Never be notified. Hide from the discussion list. - unignore: Unignore + forum: + following: Following + ignoring: Ignoring + follow: Follow + unfollow: Unfollow + ignore: Ignore + notify_new_post: Someone posts in a discussion I'm following + new_post_notification: "{username} posted" + not_following: Not Following + not_following_description: Be notified when @mentioned. + following_description: Be notified of all replies. + ignoring_description: Never be notified. Hide from the discussion list. + unignore: Unignore diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index 66210308c..6b9c2f18a 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -1,20 +1,15 @@ flarum-tags: - tags: Tags - discussion_tagged_post: - one: "{username} {action} tag." - other: "{username} {action} tags." - added_tags: "added the {tags}" - removed_tags: "removed the {tags}" - tag_new_discussion_title: Choose Tags for Your Discussion - tag_new_discussion_link: Choose Tags - edit_discussion_tags_title: "Edit Tags for {title}" - edit_discussion_tags_link: Edit Tags - choose_primary_tags: - one: Choose a primary tag - other: "Choose {count} primary tags" - choose_secondary_tags: - one: Choose 1 more tag - other: "Choose {count} more tags" - confirm: Confirm - more: More... - deleted: Deleted + forum: + tags: Tags + discussion_tagged_post: "{username} {action} tag.|{username} {action} tags." + added_tags: "added the {tags}" + removed_tags: "removed the {tags}" + tag_new_discussion_title: Choose Tags for Your Discussion + tag_new_discussion_link: Choose Tags + edit_discussion_tags_title: "Edit Tags for {title}" + edit_discussion_tags_link: Edit Tags + choose_primary_tags: "Choose a primary tag|Choose {count} primary tags" + choose_secondary_tags: "Choose 1 more tag|Choose {count} more tags" + confirm: Confirm + more: More... + deleted: Deleted From 029c306bd089122d04d9527b47f2fe5c1d3635ee Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 19 Oct 2015 11:24:08 +1030 Subject: [PATCH 023/272] Add email translations; namespace reused strings --- extensions/lang-english/locale/core.yml | 214 ++++++++++++++---------- 1 file changed, 126 insertions(+), 88 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index de896fe3d..a17779c48 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -8,15 +8,15 @@ core: forum: # These strings are used in the Change Email modal dialog. - change_email_confirmation_message: => core.confirmation_email_sent - change_email_dismiss_button: => core.okay - change_email_submit_button: => core.save_changes - change_email_title: => core.change_email + change_email_confirmation_message: => core.ref.confirmation_email_sent + change_email_dismiss_button: => core.ref.okay + change_email_submit_button: => core.ref.save_changes + change_email_title: => core.ref.change_email # These strings are used in the Change Password modal dialog. change_password_send_button: Send Password Reset Email change_password_text: Click the button below and check your email for a link to change your password. - change_password_title: => core.change_password + change_password_title: => core.ref.change_password # These strings are used by the composer controls. composer_close_tooltip: Close @@ -33,10 +33,10 @@ core: # These strings are used by the composer when editing a post. composer_edit_discard_confirmation: You have not saved your changes. Do you wish to discard them? composer_edit_post_link: "Post #{number} in {discussion}" - composer_edit_submit_button: => core.save_changes + composer_edit_submit_button: => core.ref.save_changes # These strings are used by the composer when replying to a discussion. - composer_reply_body_placeholder: => core.write_a_reply + composer_reply_body_placeholder: => core.ref.write_a_reply composer_reply_discard_confirmation: You have not posted your reply. Do you wish to discard it? composer_reply_posted_message: Your reply was posted. composer_reply_submit_button: Post Reply @@ -45,31 +45,31 @@ core: # These strings are used by the discussion control buttons. discussion_controls_cannot_reply_button: Can't Reply discussion_controls_cannot_reply_text: You don't have permission to reply to this discussion. - discussion_controls_delete_button: => core.delete + discussion_controls_delete_button: => core.ref.delete discussion_controls_delete_confirmation: Are you sure you want to delete this discussion? - discussion_controls_delete_forever_button: => core.delete_forever + discussion_controls_delete_forever_button: => core.ref.delete_forever discussion_controls_log_in_to_reply_button: Log In to Reply discussion_controls_rename_button: Rename discussion_controls_rename_text: Enter a new title for this discussion: discussion_controls_reply_button: Reply - discussion_controls_restore_button: => core.restore + discussion_controls_restore_button: => core.ref.restore # These strings are used in the discussion list. discussion_list_empty_text: Looks like there are no discussions here. Why don't you create a new one? - discussion_list_load_more_button: => core.load_more + discussion_list_load_more_button: => core.ref.load_more discussion_list_mark_as_read_tooltip: Mark as Read discussion_list_replied_text: "{username} replied {ago}" discussion_list_started_text: "{username} started {ago}" # These strings are used in the Edit User modal dialog (admin function). - edit_user_email_label: => core.email - edit_user_password_label: => core.password - edit_user_submit_button: => core.save_changes - edit_user_username_label: => core.username + edit_user_email_label: => core.ref.email + edit_user_password_label: => core.ref.password + edit_user_submit_button: => core.ref.save_changes + edit_user_username_label: => core.ref.username # These strings are used in the Forgot Password modal dialog. - forgot_password_dismiss_button: => core.okay - forgot_password_email_placeholder: => core.email + forgot_password_dismiss_button: => core.ref.okay + forgot_password_email_placeholder: => core.ref.email forgot_password_email_sent_message: We've sent you an email containing a link to reset your password. Check your spam folder if you don't receive it within the next minute or two. forgot_password_submit_button: Recover Password forgot_password_text: Enter your email address and we will send you a link to reset your password. @@ -77,17 +77,17 @@ core: # These strings are used in the header and session dropdown menu. header_admin_button: Administration - header_log_in_link: => core.log_in - header_log_out_button: => core.log_out + header_log_in_link: => core.ref.log_in + header_log_out_button: => core.ref.log_out header_profile_button: Profile header_search_placeholder: Search Forum - header_settings_button: => core.settings - header_sign_up_link: => core.sign_up + header_settings_button: => core.ref.settings + header_sign_up_link: => core.ref.sign_up # These strings are used on the index page, peripheral to the discussion list. - index_all_discussions_link: => core.all_discussions + index_all_discussions_link: => core.ref.all_discussions index_cannot_start_discussion_button: Can't Start Discussion - index_mark_all_as_read_tooltip: => core.mark_all_as_read + index_mark_all_as_read_tooltip: => core.ref.mark_all_as_read index_refresh_tooltip: Refresh index_start_discussion_button: Start a Discussion @@ -102,28 +102,28 @@ core: log_in_confirmation_required_message: "You need to confirm your email before you can log in. We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." log_in_forgot_password_link: Forgot password? log_in_invalid_login_message: Your login details were incorrect. - log_in_password_placeholder: => core.password + log_in_password_placeholder: => core.ref.password log_in_sign_up_text: "Don't have an account? Sign Up" - log_in_submit_button: => core.log_in - log_in_title: => core.log_in + log_in_submit_button: => core.ref.log_in + log_in_title: => core.ref.log_in log_in_username_or_email_placeholder: Username or Email # These strings are used by the Notifications dropdown, a.k.a. "the bell". notifications_discussion_renamed_text: "{username} changed the title" notifications_empty_text: No Notifications - notifications_mark_all_as_read_tooltip: => core.mark_all_as_read - notifications_title: => core.notifications - notifications_tooltip: => core.notifications + notifications_mark_all_as_read_tooltip: => core.ref.mark_all_as_read + notifications_title: => core.ref.notifications + notifications_tooltip: => core.ref.notifications # These strings are used by tooltips displayed for individual posts. post_edited_tooltip: "{username} edited {ago}" post_number_tooltip: "Post #{number}" # These strings are used by the post control buttons. - post_controls_delete_button: => core.delete - post_controls_delete_forever_button: => core.delete_forever - post_controls_edit_button: => core.edit - post_controls_restore_button: => core.restore + post_controls_delete_button: => core.ref.delete + post_controls_delete_forever_button: => core.ref.delete_forever + post_controls_edit_button: => core.ref.edit + post_controls_restore_button: => core.ref.restore # These strings are used in the scrubber to the right of the post stream. post_scrubber_now_link: Now @@ -133,48 +133,48 @@ core: # These strings are displayed between posts in the post stream. post_stream_discussion_renamed_text: "{username} changed the title from {old} to {new}." - post_stream_reply_placeholder: => core.write_a_reply + post_stream_reply_placeholder: => core.ref.write_a_reply post_stream_time_lapsed_text: "{period} later" # These strings are used by the search results dropdown list. search_all_discussions_button: 'Search all discussions for "{query}"' - search_discussions_heading: => core.discussions + search_discussions_heading: => core.ref.discussions search_users_heading: Users # These strings are used in the Settings page. settings_account_heading: Account - settings_change_email_button: => core.change_email - settings_change_password_button: => core.change_password - settings_notifications_heading: => core.notifications + settings_change_email_button: => core.ref.change_email + settings_change_password_button: => core.ref.change_password + settings_notifications_heading: => core.ref.notifications settings_privacy_disclose_online_label: Allow others to see when I am online settings_privacy_heading: Privacy - settings_title: => core.settings + settings_title: => core.ref.settings # These strings are used in the Notifications grid on the Settings page. - settings_notify_by_email_heading: => core.email + settings_notify_by_email_heading: => core.ref.email settings_notify_by_web_heading: Web settings_notify_discussion_renamed_label: Someone renames a discussion I started # These strings are used in the Sign Up modal dialog. - sign_up_confirmation_message: => core.confirmation_email_sent - sign_up_email_placeholder: => core.email - sign_up_dismiss_button: => core.okay + sign_up_confirmation_message: => core.ref.confirmation_email_sent + sign_up_email_placeholder: => core.ref.email + sign_up_dismiss_button: => core.ref.okay sign_up_log_in_text: "Already have an account? Log In" - sign_up_password_placeholder: => core.password - sign_up_submit_button: => core.sign_up - sign_up_title: => core.sign_up - sign_up_username_placeholder: => core.username + sign_up_password_placeholder: => core.ref.password + sign_up_submit_button: => core.ref.sign_up + sign_up_title: => core.ref.sign_up + sign_up_username_placeholder: => core.ref.username sign_up_welcome_text: "Welcome, {username}!" # These strings are used in the user profile page and profile popup. user_bio_placeholder: Write something about yourself user_deleted_text: "[deleted]" - user_discussions_link: => core.discussions + user_discussions_link: => core.ref.discussions user_joined_date_text: "Joined {ago}" user_online_text: Online - user_posts_load_more_button: => core.load_more + user_posts_load_more_button: => core.ref.load_more user_posts_link: Posts - user_settings_link: => core.settings + user_settings_link: => core.ref.settings # These strings are used to control the avatar in the user profile page. user_avatar_remove_button: Remove @@ -182,9 +182,9 @@ core: # These strings are found on the user profile page (admin function). user_controls_button: Controls - user_controls_delete_button: => core.delete + user_controls_delete_button: => core.ref.delete user_controls_delete_confirmation: Are you sure you want to delete this user? All of the user's posts will be deleted. - user_controls_edit_button: => core.edit + user_controls_edit_button: => core.ref.edit # Strings in this namespace are used by the admin interface. admin: @@ -198,10 +198,10 @@ core: appearance_dark_mode_label: Dark Mode appearance_edit_css_button: Edit Custom CSS appearance_enter_hex_message: Please enter a hexadecimal color code. - appearance_submit_button: => core.save_changes + appearance_submit_button: => core.ref.save_changes # These strings are used in the Basics page. - basics_all_discussions_label: => core.all_discussions + basics_all_discussions_label: => core.ref.all_discussions basics_default_language_heading: Default Language basics_forum_description_heading: Forum Description basics_forum_description_text: Enter a short sentence or two that describes your community. This will appear in the meta tag and show up in search engines. @@ -209,7 +209,7 @@ core: basics_home_page_heading: Home Page basics_home_page_text: Choose the page which users will first see when they visit your forum. If entering a custom value, use the path relative to the forum root. basics_saved_message: Your changes were saved. - basics_submit_button: => core.save_changes + basics_submit_button: => core.ref.save_changes basics_welcome_banner_heading: Welcome Banner basics_welcome_banner_text: Configure the text that displays in the banner on the All Discussions page. Use this to welcome guests to your forum. @@ -231,21 +231,21 @@ core: edit_group_name_label: Name edit_group_plural_placeholder: Plural (e.g. Mods) edit_group_singular_placeholder: Singular (e.g. Mod) - edit_group_submit_button: => core.save_changes + edit_group_submit_button: => core.ref.save_changes edit_group_title: Create Group # These strings are used in the Extensions page. extensions_add_button: Add Extension extensions_disable_button: Disable extensions_enable_button: Enable - extensions_settings_button: => core.settings + extensions_settings_button: => core.ref.settings extensions_uninstall_button: Uninstall # This string is used in the Extensions loading modal dialog. extensions_loading_title: Please Wait... # This string is used in the session dropdown menu. - header_log_out_button: => core.log_out + header_log_out_button: => core.ref.log_out # These strings are used in the navigation bar. nav_appearance_button: Appearance @@ -300,39 +300,77 @@ core: # REUSED STRINGS - The following keys are referenced by two or more unique keys. ## - all_discussions: All Discussions - change_email: Change Email - change_password: Change Password - confirmation_email_sent: "We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." - delete: Delete - delete_forever: Delete Forever - discussions: Discussions - edit: Edit - email: Email - load_more: Load More - log_in: Log In - log_out: Log Out - mark_all_as_read: Mark All as Read - notifications: Notifications - okay: OK - password: Password - restore: Restore - save_changes: Save Changes - settings: Settings - sign_up: Sign Up - username: Username - write_a_reply: Write a Reply... + ref: + all_discussions: All Discussions + change_email: Change Email + change_password: Change Password + confirmation_email_sent: "We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." + delete: Delete + delete_forever: Delete Forever + discussions: Discussions + edit: Edit + email: Email + load_more: Load More + log_in: Log In + log_out: Log Out + mark_all_as_read: Mark All as Read + notifications: Notifications + okay: OK + password: Password + restore: Restore + save_changes: Save Changes + settings: Settings + sign_up: Sign Up + username: Username + write_a_reply: Write a Reply... ## # DEFAULT GROUP NAMES - Translations for the forum's default language are used. ## - group_admin: Admin - group_admins: Admins - group_guest: Guest - group_guests: Guests - group_member: Member - group_members: Members - group_mod: Mod - group_mods: Mods + group: + admin: Admin + admins: Admins + guest: Guest + guests: Guests + member: Member + members: Members + mod: Mod + mods: Mods + email: + activate_account: + subject: Activate Your New Account + body: | + Hey {username}! + + Someone (hopefully you!) has signed up to {forum} with this email address. + + If this was you, simply click the following link and your account will be activated: + {url} + + If you did not sign up, please ignore this email. + + confirm_email: + subject: Activate Your New Account + body: | + Hey {username}! + + Someone (hopefully you!) has changed their email address on {forum} to this one. + + If this was you, simply click the following link and your email will be confirmed: + {url} + + If this was not you, please ignore this email. + + reset_password: + subject: Activate Your New Account + body: | + Hey {username}! + + Someone (hopefully you!) has submitted a forgotten password request for your account on {forum}. + + If this was you, click the following link to reset your password: + {url} + + If you do not wish to change your password, just ignore this email and nothing will happen. From d3c1097f86ce5f755038122c48e54c43fb6ab441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Mon, 19 Oct 2015 10:11:40 +0200 Subject: [PATCH 024/272] Use right email subjects. --- extensions/lang-english/locale/core.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index a17779c48..7c6a76574 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -352,7 +352,7 @@ core: If you did not sign up, please ignore this email. confirm_email: - subject: Activate Your New Account + subject: Confirm Your New Email Address body: | Hey {username}! @@ -364,7 +364,7 @@ core: If this was not you, please ignore this email. reset_password: - subject: Activate Your New Account + subject: Reset Your Password body: | Hey {username}! From 1eaa2c5130f4ad622eef13aaca2b594f4d240592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Mon, 19 Oct 2015 10:20:05 +0200 Subject: [PATCH 025/272] Valid SVG 1.1 Markup. --- extensions/lang-english/icon.svg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/icon.svg b/extensions/lang-english/icon.svg index 36c988974..097ef910c 100644 --- a/extensions/lang-english/icon.svg +++ b/extensions/lang-english/icon.svg @@ -1,6 +1,8 @@ - + + + - + From f27d328c843a2230a1d6d093222b680e85ba7982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Mon, 19 Oct 2015 10:30:16 +0200 Subject: [PATCH 026/272] Comment the code --- extensions/lang-english/.editorconfig | 7 +++++++ extensions/lang-english/.gitattributes | 19 ++++++++++++------- extensions/lang-english/.gitignore | 7 +++++++ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/extensions/lang-english/.editorconfig b/extensions/lang-english/.editorconfig index 72e9364d7..3dbb3a18b 100644 --- a/extensions/lang-english/.editorconfig +++ b/extensions/lang-english/.editorconfig @@ -1,7 +1,12 @@ +# EditorConfig makes it easy to maintain the correct coding style +# when switching between different text editors and projects. # http://editorconfig.org/ +# Top-most EditorConfig file. Do not search in parent directories. root = true +# Set two space indentation, line endings to Unix (LF) with a final newline, +# default charset to UTF-8, and trim trailing whitespace in all files. [*] indent_style = space indent_size = 2 @@ -10,8 +15,10 @@ charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true +# Set four space indentation in JSON and PHP files. [*.{json,php}] indent_size = 4 +# Do not trim trailing whitespace in Markdown files. [*.md] trim_trailing_whitespace = false diff --git a/extensions/lang-english/.gitattributes b/extensions/lang-english/.gitattributes index 542973100..f81350e7d 100644 --- a/extensions/lang-english/.gitattributes +++ b/extensions/lang-english/.gitattributes @@ -1,20 +1,25 @@ -# Automatically normalize line endings for all text-based files +# The gitattributes file is a simple text file that gives +# attributes to pathnames. +# http://git-scm.com/docs/gitattributes + +# Automatically normalize line endings for all text-based files. # http://git-scm.com/docs/gitattributes#_end_of_line_conversion * text=auto -# For the following file types, normalize line endings to LF on -# check in and prevent conversion to CRLF when they are checked out -# (this is required in order to prevent newline related issues like, -# for example, after the build script is run) +# For the following file types, normalize line endings to LF on check +# in and prevent conversion to CRLF when they are checked out (this +# is required in order to prevent newline related issues like, for +# example, after the build script is run). .* text eol=lf *.js text eol=lf *.json text eol=lf *.md text eol=lf *.php text eol=lf +*.svg text eol=lf *.yml text eol=lf -# Exclude the following files when exporting an archive -# https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes#Exporting-Your-Repository +# Exclude the following files when exporting an archive. +# http://git-scm.com/docs/gitattributes#_creating_an_archive .editorconfig export-ignore .gitattributes export-ignore .gitignore export-ignore diff --git a/extensions/lang-english/.gitignore b/extensions/lang-english/.gitignore index a4f3b125e..d773b8db5 100644 --- a/extensions/lang-english/.gitignore +++ b/extensions/lang-english/.gitignore @@ -1,4 +1,11 @@ +# The .gitignore file specifies intentionally untracked files that +# Git should ignore. Files already tracked by Git are not affected. +# http://git-scm.com/docs/gitignore + +# Composer /vendor composer.phar + +# Operating systems .DS_Store Thumbs.db From 8dda2018f4c245ff17215ba9cb399264e980431a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Mon, 19 Oct 2015 10:43:14 +0200 Subject: [PATCH 027/272] Update translating instructions --- extensions/lang-english/README.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/extensions/lang-english/README.md b/extensions/lang-english/README.md index 7642592a4..b7e8e906e 100644 --- a/extensions/lang-english/README.md +++ b/extensions/lang-english/README.md @@ -6,12 +6,4 @@ This language pack is bundled with [Flarum](http://flarum.org/download/). ## Translating Flarum -1. Fork this repository. -2. Edit the [flarum.json](flarum.json) file: - - `name` A lowercase and hyphens only name (e.g. **french**, **drunk-pirates**). - - `title` A short descriptive label for the extension list (e.g. **French**, **Drunk Pirates Arr**). - - `locale` An [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) code of your locale, or a short identifier of at least 3 characters to prevent conflicts (e.g. **fr**, **pirate**). - - `description` Complete description, possible in the same language (e.g. **Française pour vous**, **Arrr matey hoist the sails**). - - `author` Replace with your own information. - - `icon` Change to suit your needs, play with the name for the FontAwesome icon, color for the icon color and background for the background color of the icon. -3. Modify the files under `/locale` to suit your needs. These hold all the actual translations. +Because Flarum is at an early development stage, instructions to translate it are currently unavailable. Please check [our documentation](http://flarum.org/docs/translate/) when it will be written. From be172f509272cc1dcb26eecaaa9102c3f4bb9e2f Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Mon, 19 Oct 2015 18:24:38 +0900 Subject: [PATCH 028/272] Group translation keys by sub-key instead of prefix - Adds new sub-keys to replace key prefixes, and adjusts key names accordingly. - Moves several button strings from `admin.permissions_` to `admin.permissions_controls` - Merges `forum.settings_notify_` strings into `forum.settings` - Rolls `forum.user_avatar_` strings into `forum.user` - Moves the `user_deleted_text` to the `lib` namespace. - Adds four other leftover strings to the `lib` namespace. - Includes minor changes to formatting and comments. --- extensions/lang-english/locale/core.yml | 612 +++++++++++++----------- 1 file changed, 334 insertions(+), 278 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 7c6a76574..1f587d2c2 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -4,302 +4,347 @@ core: # UNIQUE KEYS - The following keys are used in only one location each. ## - # Strings in this namespace are used by the forum user interface. - forum: - - # These strings are used in the Change Email modal dialog. - change_email_confirmation_message: => core.ref.confirmation_email_sent - change_email_dismiss_button: => core.ref.okay - change_email_submit_button: => core.ref.save_changes - change_email_title: => core.ref.change_email - - # These strings are used in the Change Password modal dialog. - change_password_send_button: Send Password Reset Email - change_password_text: Click the button below and check your email for a link to change your password. - change_password_title: => core.ref.change_password - - # These strings are used by the composer controls. - composer_close_tooltip: Close - composer_exit_full_screen_tooltip: Exit Full Screen - composer_full_screen_tooltip: Full Screen - composer_minimize_tooltip: Minimize - - # These strings are used by the composer when starting a discussion. - composer_discussion_body_placeholder: Write a Post... - composer_discussion_discard_confirmation: You have not posted your discussion. Do you wish to discard it? - composer_discussion_submit_button: Post Discussion - composer_discussion_title_placeholder: Discussion Title - - # These strings are used by the composer when editing a post. - composer_edit_discard_confirmation: You have not saved your changes. Do you wish to discard them? - composer_edit_post_link: "Post #{number} in {discussion}" - composer_edit_submit_button: => core.ref.save_changes - - # These strings are used by the composer when replying to a discussion. - composer_reply_body_placeholder: => core.ref.write_a_reply - composer_reply_discard_confirmation: You have not posted your reply. Do you wish to discard it? - composer_reply_posted_message: Your reply was posted. - composer_reply_submit_button: Post Reply - composer_reply_view_button: View - - # These strings are used by the discussion control buttons. - discussion_controls_cannot_reply_button: Can't Reply - discussion_controls_cannot_reply_text: You don't have permission to reply to this discussion. - discussion_controls_delete_button: => core.ref.delete - discussion_controls_delete_confirmation: Are you sure you want to delete this discussion? - discussion_controls_delete_forever_button: => core.ref.delete_forever - discussion_controls_log_in_to_reply_button: Log In to Reply - discussion_controls_rename_button: Rename - discussion_controls_rename_text: Enter a new title for this discussion: - discussion_controls_reply_button: Reply - discussion_controls_restore_button: => core.ref.restore - - # These strings are used in the discussion list. - discussion_list_empty_text: Looks like there are no discussions here. Why don't you create a new one? - discussion_list_load_more_button: => core.ref.load_more - discussion_list_mark_as_read_tooltip: Mark as Read - discussion_list_replied_text: "{username} replied {ago}" - discussion_list_started_text: "{username} started {ago}" - - # These strings are used in the Edit User modal dialog (admin function). - edit_user_email_label: => core.ref.email - edit_user_password_label: => core.ref.password - edit_user_submit_button: => core.ref.save_changes - edit_user_username_label: => core.ref.username - - # These strings are used in the Forgot Password modal dialog. - forgot_password_dismiss_button: => core.ref.okay - forgot_password_email_placeholder: => core.ref.email - forgot_password_email_sent_message: We've sent you an email containing a link to reset your password. Check your spam folder if you don't receive it within the next minute or two. - forgot_password_submit_button: Recover Password - forgot_password_text: Enter your email address and we will send you a link to reset your password. - forgot_password_title: Forgot Password - - # These strings are used in the header and session dropdown menu. - header_admin_button: Administration - header_log_in_link: => core.ref.log_in - header_log_out_button: => core.ref.log_out - header_profile_button: Profile - header_search_placeholder: Search Forum - header_settings_button: => core.ref.settings - header_sign_up_link: => core.ref.sign_up - - # These strings are used on the index page, peripheral to the discussion list. - index_all_discussions_link: => core.ref.all_discussions - index_cannot_start_discussion_button: Can't Start Discussion - index_mark_all_as_read_tooltip: => core.ref.mark_all_as_read - index_refresh_tooltip: Refresh - index_start_discussion_button: Start a Discussion - - # These strings are used by the sorting control above the discussion list. - index_sort_latest_button: Latest - index_sort_newest_button: Newest - index_sort_oldest_button: Oldest - index_sort_relevance_button: Relevance - index_sort_top_button: Top - - # These strings are used in the Log In modal dialog. - log_in_confirmation_required_message: "You need to confirm your email before you can log in. We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." - log_in_forgot_password_link: Forgot password? - log_in_invalid_login_message: Your login details were incorrect. - log_in_password_placeholder: => core.ref.password - log_in_sign_up_text: "Don't have an account? Sign Up" - log_in_submit_button: => core.ref.log_in - log_in_title: => core.ref.log_in - log_in_username_or_email_placeholder: Username or Email - - # These strings are used by the Notifications dropdown, a.k.a. "the bell". - notifications_discussion_renamed_text: "{username} changed the title" - notifications_empty_text: No Notifications - notifications_mark_all_as_read_tooltip: => core.ref.mark_all_as_read - notifications_title: => core.ref.notifications - notifications_tooltip: => core.ref.notifications - - # These strings are used by tooltips displayed for individual posts. - post_edited_tooltip: "{username} edited {ago}" - post_number_tooltip: "Post #{number}" - - # These strings are used by the post control buttons. - post_controls_delete_button: => core.ref.delete - post_controls_delete_forever_button: => core.ref.delete_forever - post_controls_edit_button: => core.ref.edit - post_controls_restore_button: => core.ref.restore - - # These strings are used in the scrubber to the right of the post stream. - post_scrubber_now_link: Now - post_scrubber_original_post_link: Original Post - post_scrubber_unread_text: "{count} unread" - post_scrubber_viewing_text: "{index} of {count} post|{index} of {count} posts" - - # These strings are displayed between posts in the post stream. - post_stream_discussion_renamed_text: "{username} changed the title from {old} to {new}." - post_stream_reply_placeholder: => core.ref.write_a_reply - post_stream_time_lapsed_text: "{period} later" - - # These strings are used by the search results dropdown list. - search_all_discussions_button: 'Search all discussions for "{query}"' - search_discussions_heading: => core.ref.discussions - search_users_heading: Users - - # These strings are used in the Settings page. - settings_account_heading: Account - settings_change_email_button: => core.ref.change_email - settings_change_password_button: => core.ref.change_password - settings_notifications_heading: => core.ref.notifications - settings_privacy_disclose_online_label: Allow others to see when I am online - settings_privacy_heading: Privacy - settings_title: => core.ref.settings - - # These strings are used in the Notifications grid on the Settings page. - settings_notify_by_email_heading: => core.ref.email - settings_notify_by_web_heading: Web - settings_notify_discussion_renamed_label: Someone renames a discussion I started - - # These strings are used in the Sign Up modal dialog. - sign_up_confirmation_message: => core.ref.confirmation_email_sent - sign_up_email_placeholder: => core.ref.email - sign_up_dismiss_button: => core.ref.okay - sign_up_log_in_text: "Already have an account? Log In" - sign_up_password_placeholder: => core.ref.password - sign_up_submit_button: => core.ref.sign_up - sign_up_title: => core.ref.sign_up - sign_up_username_placeholder: => core.ref.username - sign_up_welcome_text: "Welcome, {username}!" - - # These strings are used in the user profile page and profile popup. - user_bio_placeholder: Write something about yourself - user_deleted_text: "[deleted]" - user_discussions_link: => core.ref.discussions - user_joined_date_text: "Joined {ago}" - user_online_text: Online - user_posts_load_more_button: => core.ref.load_more - user_posts_link: Posts - user_settings_link: => core.ref.settings - - # These strings are used to control the avatar in the user profile page. - user_avatar_remove_button: Remove - user_avatar_upload_button: Upload - - # These strings are found on the user profile page (admin function). - user_controls_button: Controls - user_controls_delete_button: => core.ref.delete - user_controls_delete_confirmation: Are you sure you want to delete this user? All of the user's posts will be deleted. - user_controls_edit_button: => core.ref.edit - # Strings in this namespace are used by the admin interface. admin: # These strings are used in the Appearance page. - appearance_colored_header_label: Colored Header - appearance_colors_heading: Colors - appearance_colors_text: Choose two colors to theme your forum with. The first will be used as a highlight color, while the second will be used to style background elements. - appearance_custom_styles_heading: Custom Styles - appearance_custom_styles_text: Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles. - appearance_dark_mode_label: Dark Mode - appearance_edit_css_button: Edit Custom CSS - appearance_enter_hex_message: Please enter a hexadecimal color code. - appearance_submit_button: => core.ref.save_changes + appearance: + colored_header_label: Colored Header + colors_heading: Colors + colors_text: Choose two colors to theme your forum with. The first will be used as a highlight color, while the second will be used to style background elements. + custom_styles_heading: Custom Styles + custom_styles_text: Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles. + dark_mode_label: Dark Mode + edit_css_button: Edit Custom CSS + enter_hex_message: Please enter a hexadecimal color code. + submit_button: => core.ref.save_changes # These strings are used in the Basics page. - basics_all_discussions_label: => core.ref.all_discussions - basics_default_language_heading: Default Language - basics_forum_description_heading: Forum Description - basics_forum_description_text: Enter a short sentence or two that describes your community. This will appear in the meta tag and show up in search engines. - basics_forum_title_heading: Forum Title - basics_home_page_heading: Home Page - basics_home_page_text: Choose the page which users will first see when they visit your forum. If entering a custom value, use the path relative to the forum root. - basics_saved_message: Your changes were saved. - basics_submit_button: => core.ref.save_changes - basics_welcome_banner_heading: Welcome Banner - basics_welcome_banner_text: Configure the text that displays in the banner on the All Discussions page. Use this to welcome guests to your forum. + basics: + all_discussions_label: => core.ref.all_discussions + default_language_heading: Default Language + forum_description_heading: Forum Description + forum_description_text: Enter a short sentence or two that describes your community. This will appear in the meta tag and show up in search engines. + forum_title_heading: Forum Title + home_page_heading: Home Page + home_page_text: Choose the page which users will first see when they visit your forum. If entering a custom value, use the path relative to the forum root. + saved_message: Your changes were saved. + submit_button: => core.ref.save_changes + welcome_banner_heading: Welcome Banner + welcome_banner_text: Configure the text that displays in the banner on the All Discussions page. Use this to welcome guests to your forum. # These strings are used in the Dashboard page. - dashboard_beta_warning_text: "This beta software is provided primarily so that you can help us test it and make it better; it should not be used in production." - dashboard_contributing_text: "Want to look for bugs and contribute? Read the Contributing docs." - dashboard_extension_text: "Interested in developing extensions? Read the Extension docs." - dashboard_features_text: "Got an idea to improve a feature? Tell us about it under the Features tag." - dashboard_support_text: "Found a bug? Please report it in our forum, under the Support tag." - dashboard_troubleshooting_text: "Having problems? Follow the instructions in the Troubleshooting docs." - dashboard_version_text: "Thanks for trying out Flarum! You are running version {version}." + dashboard: + beta_warning_text: "This beta software is provided primarily so that you can help us test it and make it better; it should not be used in production." + contributing_text: "Want to look for bugs and contribute? Read the Contributing docs." + extension_text: "Interested in developing extensions? Read the Extension docs." + features_text: "Got an idea to improve a feature? Tell us about it under the Features tag." + support_text: "Found a bug? Please report it in our forum, under the Support tag." + troubleshooting_text: "Having problems? Follow the instructions in the Troubleshooting docs." + version_text: "Thanks for trying out Flarum! You are running version {version}." # These strings are used in the Edit Group modal dialog. - edit_group_color_label: Color - edit_group_delete_button: Delete Group - edit_group_delete_confirmation: Are you sure you want to delete this group? The group members will NOT be deleted. - edit_group_icon_label: Icon - edit_group_icon_text: "Enter the name of any FontAwesome icon class, without the fa- prefix." - edit_group_name_label: Name - edit_group_plural_placeholder: Plural (e.g. Mods) - edit_group_singular_placeholder: Singular (e.g. Mod) - edit_group_submit_button: => core.ref.save_changes - edit_group_title: Create Group + edit_group: + color_label: Color + delete_button: Delete Group + delete_confirmation: Are you sure you want to delete this group? The group members will NOT be deleted. + icon_label: Icon + icon_text: "Enter the name of any FontAwesome icon class, without the fa- prefix." + name_label: Name + plural_placeholder: Plural (e.g. Mods) + singular_placeholder: Singular (e.g. Mod) + submit_button: => core.ref.save_changes + title: Create Group # These strings are used in the Extensions page. - extensions_add_button: Add Extension - extensions_disable_button: Disable - extensions_enable_button: Enable - extensions_settings_button: => core.ref.settings - extensions_uninstall_button: Uninstall - - # This string is used in the Extensions loading modal dialog. - extensions_loading_title: Please Wait... + extensions: + add_button: Add Extension + disable_button: Disable + enable_button: Enable + settings_button: => core.ref.settings + uninstall_button: Uninstall # This string is used in the session dropdown menu. - header_log_out_button: => core.ref.log_out + header: + log_out_button: => core.ref.log_out + + # This string is used in the modal dialog displayed when loading extensions. + loading: + title: Please Wait... # These strings are used in the navigation bar. - nav_appearance_button: Appearance - nav_appearance_text: Customize your forum's colors, logos, and other variables. - nav_basics_button: Basics - nav_basics_text: Set your forum title, language, and other basic settings. - nav_dashboard_button: Dashboard - nav_dashboard_text: Your forum at a glance. - nav_extensions_button: Extensions - nav_extensions_text: Add extra functionality to your forum and make it your own. - nav_permissions_button: Permissions - nav_permissions_text: Configure who can see and do what. + nav: + appearance_button: Appearance + appearance_text: Customize your forum's colors, logos, and other variables. + basics_button: Basics + basics_text: Set your forum title, language, and other basic settings. + dashboard_button: Dashboard + dashboard_text: Your forum at a glance. + extensions_button: Extensions + extensions_text: Add extra functionality to your forum and make it your own. + permissions_button: Permissions + permissions_text: Configure who can see and do what. # These strings are used in the Permissions page of the admin interface. - permissions_allow_indefinitely_button: Indefinitely - permissions_allow_renaming_label: Allow renaming - permissions_allow_post_editing_label: Allow post editing - permissions_allow_some_minutes_button: "For {count} minute|For {count} minutes" - permissions_allow_ten_minutes_button: For 10 minutes - permissions_allow_until_reply_button: Until next reply - permissions_create_heading: Create - permissions_delete_discussions_forever_label: Delete discussions forever - permissions_delete_discussions_label: Delete discussions - permissions_delete_posts_forever_label: Delete posts forever - permissions_edit_and_delete_posts_label: Edit and delete posts - permissions_global_heading: Global - permissions_moderate_heading: Moderate - permissions_new_group_button: New Group - permissions_participate_heading: Participate - permissions_read_heading: Read - permissions_rename_discussions_label: Rename discussions - permissions_reply_to_discussions_label: Reply to discussions - permissions_signup_closed_button: Closed - permissions_signup_open_button: Open - permissions_sign_up_label: Sign up - permissions_start_discussions_label: Start discussions - permissions_view_discussions_label: View discussions + permissions: + allow_renaming_label: Allow renaming + allow_post_editing_label: Allow post editing + create_heading: Create + delete_discussions_forever_label: Delete discussions forever + delete_discussions_label: Delete discussions + delete_posts_forever_label: Delete posts forever + edit_and_delete_posts_label: Edit and delete posts + global_heading: Global + moderate_heading: Moderate + new_group_button: New Group + participate_heading: Participate + read_heading: Read + rename_discussions_label: Rename discussions + reply_to_discussions_label: Reply to discussions + sign_up_label: Sign up + start_discussions_label: Start discussions + view_discussions_label: View discussions # These strings are used in the dropdown menus on the Permissions page. - permissions_dropdown_everyone_button: Everyone - permissions_dropdown_members_button: Members + permissions_controls: + allow_indefinitely_button: Indefinitely + allow_some_minutes_button: "For {count} minute|For {count} minutes" + allow_ten_minutes_button: For 10 minutes + allow_until_reply_button: Until next reply + everyone_button: Everyone + members_button: => core.groups.members + signup_closed_button: Closed + signup_open_button: Open + + # Strings in this namespace are used by the forum user interface. + forum: + + # These strings are used in the Change Email modal dialog. + change_email: + confirmation_message: => core.ref.confirmation_email_sent + dismiss_button: => core.ref.okay + submit_button: => core.ref.save_changes + title: => core.ref.change_email + + # These strings are used in the Change Password modal dialog. + change_password: + send_button: Send Password Reset Email + text: Click the button below and check your email for a link to change your password. + title: => core.ref.change_password + + # These strings are used by the composer controls. + composer: + close_tooltip: Close + exit_full_screen_tooltip: Exit Full Screen + full_screen_tooltip: Full Screen + minimize_tooltip: Minimize + + # These strings are used by the composer when starting a discussion. + composer_discussion: + body_placeholder: Write a Post... + discard_confirmation: You have not posted your discussion. Do you wish to discard it? + submit_button: Post Discussion + title_placeholder: Discussion Title + + # These strings are used by the composer when editing a post. + composer_edit: + discard_confirmation: You have not saved your changes. Do you wish to discard them? + post_link: "Post #{number} in {discussion}" + submit_button: => core.ref.save_changes + + # These strings are used by the composer when replying to a discussion. + composer_reply: + body_placeholder: => core.ref.write_a_reply + discard_confirmation: You have not posted your reply. Do you wish to discard it? + posted_message: Your reply was posted. + submit_button: Post Reply + view_button: View + + # These strings are used by the discussion control buttons. + discussion_controls: + cannot_reply_button: Can't Reply + cannot_reply_text: You don't have permission to reply to this discussion. + delete_button: => core.ref.delete + delete_confirmation: Are you sure you want to delete this discussion? + delete_forever_button: => core.ref.delete_forever + log_in_to_reply_button: Log In to Reply + rename_button: Rename + rename_text: Enter a new title for this discussion: + reply_button: Reply + restore_button: => core.ref.restore + + # These strings are used in the discussion list. + discussion_list: + empty_text: Looks like there are no discussions here. Why don't you create a new one? + load_more_button: => core.ref.load_more + mark_as_read_tooltip: Mark as Read + replied_text: "{username} replied {ago}" + started_text: "{username} started {ago}" + + # These strings are used in the Edit User modal dialog (admin function). + edit_user: + email_label: => core.ref.email + password_label: => core.ref.password + submit_button: => core.ref.save_changes + username_label: => core.ref.username + + # These strings are used in the Forgot Password modal dialog. + forgot_password: + dismiss_button: => core.ref.okay + email_placeholder: => core.ref.email + email_sent_message: We've sent you an email containing a link to reset your password. Check your spam folder if you don't receive it within the next minute or two. + submit_button: Recover Password + text: Enter your email address and we will send you a link to reset your password. + title: Forgot Password + + # These strings are used in the header and session dropdown menu. + header: + admin_button: Administration + log_in_link: => core.ref.log_in + log_out_button: => core.ref.log_out + profile_button: Profile + search_placeholder: Search Forum + settings_button: => core.ref.settings + sign_up_link: => core.ref.sign_up + + # These strings are used on the index page, peripheral to the discussion list. + index: + all_discussions_link: => core.ref.all_discussions + cannot_start_discussion_button: Can't Start Discussion + mark_all_as_read_tooltip: => core.ref.mark_all_as_read + refresh_tooltip: Refresh + start_discussion_button: Start a Discussion + + # These strings are used by the sorting control above the discussion list. + index_sort: + latest_button: Latest + newest_button: Newest + oldest_button: Oldest + relevance_button: Relevance + top_button: Top + + # These strings are used in the Log In modal dialog. + log_in: + confirmation_required_message: "You need to confirm your email before you can log in. We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." + forgot_password_link: Forgot password? + invalid_login_message: Your login details were incorrect. + password_placeholder: => core.ref.password + sign_up_text: "Don't have an account? Sign Up" + submit_button: => core.ref.log_in + title: => core.ref.log_in + username_or_email_placeholder: Username or Email + + # These strings are used by the Notifications dropdown, a.k.a. "the bell". + notifications: + discussion_renamed_text: "{username} changed the title" + empty_text: No Notifications + mark_all_as_read_tooltip: => core.ref.mark_all_as_read + title: => core.ref.notifications + tooltip: => core.ref.notifications + + # These strings are used by tooltips displayed for individual posts. + post: + edited_tooltip: "{username} edited {ago}" + number_tooltip: "Post #{number}" + + # These strings are used by the post control buttons. + post_controls: + delete_button: => core.ref.delete + delete_forever_button: => core.ref.delete_forever + edit_button: => core.ref.edit + restore_button: => core.ref.restore + + # These strings are used in the scrubber to the right of the post stream. + post_scrubber: + now_link: Now + original_post_link: Original Post + unread_text: "{count} unread" + viewing_text: "{index} of {count} post|{index} of {count} posts" + + # These strings are displayed between posts in the post stream. + post_stream: + discussion_renamed_text: "{username} changed the title from {old} to {new}." + reply_placeholder: => core.ref.write_a_reply + time_lapsed_text: "{period} later" + + # These strings are used by the search results dropdown list. + search: + all_discussions_button: 'Search all discussions for "{query}"' + discussions_heading: => core.ref.discussions + users_heading: Users + + # These strings are used in the Settings page. + settings: + account_heading: Account + change_email_button: => core.ref.change_email + change_password_button: => core.ref.change_password + notifications_heading: => core.ref.notifications + notify_by_email_heading: => core.ref.email + notify_by_web_heading: Web + notify_discussion_renamed_label: Someone renames a discussion I started + privacy_disclose_online_label: Allow others to see when I am online + privacy_heading: Privacy + title: => core.ref.settings + + # These strings are used in the Sign Up modal dialog. + sign_up: + confirmation_message: => core.ref.confirmation_email_sent + email_placeholder: => core.ref.email + dismiss_button: => core.ref.okay + log_in_text: "Already have an account? Log In" + password_placeholder: => core.ref.password + submit_button: => core.ref.sign_up + title: => core.ref.sign_up + username_placeholder: => core.ref.username + welcome_text: "Welcome, {username}!" + + # These strings are used in the user profile page and profile popup. + user: + avatar_remove_button: Remove + avatar_upload_button: Upload + bio_placeholder: Write something about yourself + discussions_link: => core.ref.discussions + joined_date_text: "Joined {ago}" + online_text: Online + posts_load_more_button: => core.ref.load_more + posts_link: Posts + settings_link: => core.ref.settings + + # These strings are found on the user profile page (admin function). + user_controls: + button: Controls + delete_button: => core.ref.delete + delete_confirmation: Are you sure you want to delete this user? All of the user's posts will be deleted. + edit_button: => core.ref.edit # Strings in this namespace are used by the forum and admin interfaces. lib: + # This string is displayed in place of the username of deleted user account. + deleted_user_text: "[deleted]" + + # This string is displayed as the tooltip for the badge on a soft-deleted discussion. + hidden_discussion_tooltip: Hidden + + # This string is displayed when an error occurs. + oops_message: Oops! Something went wrong. Please reload the page and try again. + # These strings are used to punctuate a series of items. - series_glue_text: ", " - series_two_text: "{first} and {second}" - series_three_text: "{first}, {second}, and {third}" + series: + glue_text: ", " + two_text: "{first} and {second}" + three_text: "{first}, {second}, and {third}" + + #These strings are used as suffixes when abbreviating numbers. + suffix: + kilo_text: K + mega_text: M ## - # REUSED STRINGS - The following keys are referenced by two or more unique keys. + # REUSED STRINGS - These keys should not be used directly in code! ## + # Strings in this namespace are referenced by two or more unique keys. ref: all_discussions: All Discussions change_email: Change Email @@ -325,20 +370,13 @@ core: write_a_reply: Write a Reply... ## - # DEFAULT GROUP NAMES - Translations for the forum's default language are used. + # EMAIL CONTENT ## - group: - admin: Admin - admins: Admins - guest: Guest - guests: Guests - member: Member - members: Members - mod: Mod - mods: Mods - + # Strings in this namespace are used in emails sent by the forum. email: + + # These strings are used in emails sent when users register new accounts. activate_account: subject: Activate Your New Account body: | @@ -351,6 +389,7 @@ core: If you did not sign up, please ignore this email. + # These strings are used in emails sent when users change their email address. confirm_email: subject: Confirm Your New Email Address body: | @@ -363,6 +402,7 @@ core: If this was not you, please ignore this email. + # These strings are used in emails sent when users ask to reset their passwords. reset_password: subject: Reset Your Password body: | @@ -374,3 +414,19 @@ core: {url} If you do not wish to change your password, just ignore this email and nothing will happen. + + ## + # GROUP NAMES + ## + + # Strings in this namespace are used to translate default group names. + group: + admin: Admin + admins: Admins + guest: Guest + guests: Guests + member: Member + members: Members + mod: Mod + mods: Mods + From 664faa296ce9ba4072f3ba06140a413ce2d30e01 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Tue, 20 Oct 2015 12:28:34 +0900 Subject: [PATCH 029/272] Additional changes to library keys - Accommodates new error messages - Changes the namespace for number abbreviations --- extensions/lang-english/locale/core.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 1f587d2c2..9baf048c8 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -323,11 +323,19 @@ core: # This string is displayed in place of the username of deleted user account. deleted_user_text: "[deleted]" + # Thes strings are displayed as error messages. + error: + generic_message: Oops! Something went wrong. Please reload the page and try again. + permission_denied_message: You do not have permission to do that. + not_found_message: The requested resource was not found. + # This string is displayed as the tooltip for the badge on a soft-deleted discussion. hidden_discussion_tooltip: Hidden - # This string is displayed when an error occurs. - oops_message: Oops! Something went wrong. Please reload the page and try again. + #These strings are used as suffixes when abbreviating numbers. + number_suffix: + kilo_text: K + mega_text: M # These strings are used to punctuate a series of items. series: @@ -335,11 +343,6 @@ core: two_text: "{first} and {second}" three_text: "{first}, {second}, and {third}" - #These strings are used as suffixes when abbreviating numbers. - suffix: - kilo_text: K - mega_text: M - ## # REUSED STRINGS - These keys should not be used directly in code! ## From 350248b6e9b039408c5e14dfc4c22d729ab419f6 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 21 Oct 2015 10:26:42 +1030 Subject: [PATCH 030/272] Fix reference key name --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 9baf048c8..5109c0b95 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -112,7 +112,7 @@ core: allow_ten_minutes_button: For 10 minutes allow_until_reply_button: Until next reply everyone_button: Everyone - members_button: => core.groups.members + members_button: => core.group.members signup_closed_button: Closed signup_open_button: Open From 429161c4fe583db2e4814ee46c19fbaa77e2533a Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 21 Oct 2015 11:37:46 +1030 Subject: [PATCH 031/272] Add translations for basic HTML interface --- extensions/lang-english/locale/core.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 5109c0b95..a7eb6cb26 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -343,6 +343,13 @@ core: two_text: "{first} and {second}" three_text: "{first}, {second}, and {third}" + # Strings in this namespace are used in basic HTML interface. + basic: + load_error_message: Something went wrong while trying to load the full version of this site. + javascript_disabled_message: This site is best viewed in a modern browser with JavaScript enabled. + next_page_button: Next Page + previous_page_button: Previous Page + ## # REUSED STRINGS - These keys should not be used directly in code! ## @@ -432,4 +439,3 @@ core: members: Members mod: Mod mods: Mods - From c1a670a0ee37d7a79a8ecd1151a65da74d074f2b Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Wed, 21 Oct 2015 15:15:32 +0900 Subject: [PATCH 032/272] Reorganize key names for Flags See flarum/core #265 - Adjusts key names to three-tier namespacing. - Adds newly extracted strings. - Adds commenting to match core. --- .../lang-english/locale/flarum-flags.yml | 55 ++++++++++++++++--- 1 file changed, 48 insertions(+), 7 deletions(-) diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml index c322050a5..5ebe9f738 100644 --- a/extensions/lang-english/locale/flarum-flags.yml +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -1,9 +1,50 @@ flarum-flags: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Strings in this namespace are used by the admin interface. + admin: + + # These strings are used in the Permissions page of the admin interface. + permissions: + flag_posts: Flag posts + view_flags: View flagged posts + + # Strings in this namespace are used by the forum user interface. forum: - reason_off_topic: Off-topic - reason_spam: Spam - reason_inappropriate: Inappropriate - reason_other: Other - flagged_by: "{username} flagged" - flagged_by_with_reason: "{username} flagged as {reason}" - no_flags: No Flags + + # These strings are used by the Flag Post modal dialog. + flag_post: + reason_heading: Choose a Reason + reason_inappropriate_label: Inappropriate + reason_off_topic_label: Off-topic + reason_other_label: Other + reason_spam_label: Spam + submit_button: => flarum-flags.ref.flag_post + title: => flarum-flags.ref.flag_post + + # These strings are used by the Flagged Posts dropdown, a.k.a. "the flag". + flagged_posts: + no_flags: No Flags + title: => flarum-flags.ref.flagged_posts + tooltip: => flarum-flags.ref.flagged_posts + + # These strings are used by the frame displayed around flagged posts. + post: + dismiss_flag_tooltip: Dismiss Flag + flagged_by: "{username} flagged" + flagged_by_with_reason: "{username} flagged as {reason}" + + # These strings are used by the post control buttons. + post_controls: + flag_button: Flag + + ## + # REUSED STRINGS - The following keys are referenced by two or more unique keys. + ## + + ref: + flag_post: Flag Post + flagged_posts: Flagged Posts From e2c9683827ce942811408ed48bd496aa130fd016 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Wed, 21 Oct 2015 16:19:28 +0900 Subject: [PATCH 033/272] Reorganize key names for Lock See [flarum/core #265](https://github.com/flarum/core/issues/265). - Adjusts key names to three-tier namespacing. - Adds newly extracted strings. - Adds commenting to match core. --- .../lang-english/locale/flarum-lock.yml | 42 +++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/extensions/lang-english/locale/flarum-lock.yml b/extensions/lang-english/locale/flarum-lock.yml index 3aa1e344d..ac4876075 100644 --- a/extensions/lang-english/locale/flarum-lock.yml +++ b/extensions/lang-english/locale/flarum-lock.yml @@ -1,9 +1,37 @@ flarum-lock: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Strings in this namespace are used by the admin interface. + admin: + + # These strings are used in the Permissions page of the admin interface. + permissions: + lock_discussions_label: Lock discussions + + # Strings in this namespace are used by the forum user interface. forum: - discussion_locked_notification: "{username} locked" - discussion_locked_post: "{username} locked the discussion." - discussion_unlocked_post: "{username} unlocked the discussion." - notify_discussion_locked: Someone locks a discussion I started - locked: Locked - lock: Lock - unlock: Unlock + + # These strings are displayed as tooltips for discussion badges. + badge: + locked_discussion_tooltip: Locked + + # These strings are used by the discussion control buttons. + discussion_controls: + lock: Lock + unlock: Unlock + + # These strings are used by the Notifications dropdown, a.k.a. "the bell". + notifications: + discussion_locked_notification: "{username} locked" + + post_stream: + discussion_locked_post: "{username} locked the discussion." + discussion_unlocked_post: "{username} unlocked the discussion." + + # These strings are used in the Settings page. + settings: + notify_discussion_locked_label: Someone locks a discussion I started + From 017bb43d6970390854cc7664a4634829b1dff068 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Wed, 21 Oct 2015 16:30:20 +0900 Subject: [PATCH 034/272] Add namespacing for badges - Adds a `lib.badge` namespace to match extension handling. --- extensions/lang-english/locale/core.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index a7eb6cb26..e5bfdc4e3 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -320,6 +320,10 @@ core: # Strings in this namespace are used by the forum and admin interfaces. lib: + # These strings are displayed as tooltips for discussion badges. + badge: + hidden_discussion_tooltip: Hidden + # This string is displayed in place of the username of deleted user account. deleted_user_text: "[deleted]" @@ -329,9 +333,6 @@ core: permission_denied_message: You do not have permission to do that. not_found_message: The requested resource was not found. - # This string is displayed as the tooltip for the badge on a soft-deleted discussion. - hidden_discussion_tooltip: Hidden - #These strings are used as suffixes when abbreviating numbers. number_suffix: kilo_text: K From 8a273c28eba278ab6005ca93fd1286e4e46faeb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Wed, 21 Oct 2015 10:27:14 +0200 Subject: [PATCH 035/272] Fix a typo --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index e5bfdc4e3..a777fc456 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -327,7 +327,7 @@ core: # This string is displayed in place of the username of deleted user account. deleted_user_text: "[deleted]" - # Thes strings are displayed as error messages. + # These strings are displayed as error messages. error: generic_message: Oops! Something went wrong. Please reload the page and try again. permission_denied_message: You do not have permission to do that. From 594f23f808dbbbb03adc25a46eee80594813ef71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Wed, 21 Oct 2015 10:30:34 +0200 Subject: [PATCH 036/272] Remove extra newline --- extensions/lang-english/locale/flarum-lock.yml | 1 - extensions/lang-english/locale/validation.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/extensions/lang-english/locale/flarum-lock.yml b/extensions/lang-english/locale/flarum-lock.yml index ac4876075..7a5cb1da8 100644 --- a/extensions/lang-english/locale/flarum-lock.yml +++ b/extensions/lang-english/locale/flarum-lock.yml @@ -34,4 +34,3 @@ flarum-lock: # These strings are used in the Settings page. settings: notify_discussion_locked_label: Someone locks a discussion I started - diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index 018946e3c..6d0b0a5ac 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -66,4 +66,3 @@ validation: content: content name_singular: singular name name_plural: plural name - From 99b3bd66730f39f6a98005bdba9804e2ced323e9 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Wed, 21 Oct 2015 17:39:27 +0900 Subject: [PATCH 037/272] Reorganize key names for Pusher See [flarum/core #265](https://github.com/flarum/core/issues/265). - Adjusts key names to three-tier namespacing. - Adds newly extracted strings. - Adds commenting to match core. --- .../lang-english/locale/flarum-pusher.yml | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-pusher.yml b/extensions/lang-english/locale/flarum-pusher.yml index 650ab7abf..1ef5f623a 100644 --- a/extensions/lang-english/locale/flarum-pusher.yml +++ b/extensions/lang-english/locale/flarum-pusher.yml @@ -1,3 +1,22 @@ flarum-pusher: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Strings in this namespace are used by the admin interface. + admin: + + # These strings are used in the Pusher Settings modal dialog. + pusher_settings: + app_id_label: App ID + app_key_label: App Key + app_secret_label: App Secret + title: Pusher Settings + + # Strings in this namespace are used by the admin interface. forum: - show_updated_discussions: "Show {count} updated discussion|Show {count} updated discussions" + + # These strings are used in the discussion list. + discussion_list: + show_updates_text: "Show {count} updated discussion|Show {count} updated discussions" From a1cdde209b23f29a292462a400cbb6d331cd3e88 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Wed, 21 Oct 2015 19:06:49 +0900 Subject: [PATCH 038/272] Fix key names in Lock - Fixes several key name errors in PR #17. - Adds missing comment for `post_stream`. --- extensions/lang-english/locale/flarum-lock.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/extensions/lang-english/locale/flarum-lock.yml b/extensions/lang-english/locale/flarum-lock.yml index ac4876075..c45bd133e 100644 --- a/extensions/lang-english/locale/flarum-lock.yml +++ b/extensions/lang-english/locale/flarum-lock.yml @@ -20,16 +20,17 @@ flarum-lock: # These strings are used by the discussion control buttons. discussion_controls: - lock: Lock - unlock: Unlock + lock_button: Lock + unlock_button: Unlock # These strings are used by the Notifications dropdown, a.k.a. "the bell". notifications: - discussion_locked_notification: "{username} locked" + discussion_locked_text: "{username} locked" + # These strings are displayed between posts in the post stream. post_stream: - discussion_locked_post: "{username} locked the discussion." - discussion_unlocked_post: "{username} unlocked the discussion." + discussion_locked_text: "{username} locked the discussion." + discussion_unlocked_text: "{username} unlocked the discussion." # These strings are used in the Settings page. settings: From 0f144be8cb1d8adaa70ca2dc0b3863abc6908739 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Wed, 21 Oct 2015 19:33:10 +0900 Subject: [PATCH 039/272] Fix key names in Flags - Fixes a few key name errors in PR #13 --- extensions/lang-english/locale/flarum-flags.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml index 5ebe9f738..276f26131 100644 --- a/extensions/lang-english/locale/flarum-flags.yml +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -9,8 +9,8 @@ flarum-flags: # These strings are used in the Permissions page of the admin interface. permissions: - flag_posts: Flag posts - view_flags: View flagged posts + flag_posts_label: Flag posts + view_flags_label: View flagged posts # Strings in this namespace are used by the forum user interface. forum: @@ -27,15 +27,15 @@ flarum-flags: # These strings are used by the Flagged Posts dropdown, a.k.a. "the flag". flagged_posts: - no_flags: No Flags + empty_text: No Flags title: => flarum-flags.ref.flagged_posts tooltip: => flarum-flags.ref.flagged_posts # These strings are used by the frame displayed around flagged posts. post: dismiss_flag_tooltip: Dismiss Flag - flagged_by: "{username} flagged" - flagged_by_with_reason: "{username} flagged as {reason}" + flagged_by_text: "{username} flagged" + flagged_by_with_reason_text: "{username} flagged as {reason}" # These strings are used by the post control buttons. post_controls: From 7c61dd4790bcbf3c44d8ca7f27ce28e0b03143e9 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Thu, 22 Oct 2015 09:20:24 +0900 Subject: [PATCH 040/272] Reorganize key names for Sticky See [flarum/core #265](https://github.com/flarum/core/issues/265). - Adjusts key names to three-tier namespacing. - Adds newly extracted strings. - Adds commenting to match core. --- .../lang-english/locale/flarum-sticky.yml | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/extensions/lang-english/locale/flarum-sticky.yml b/extensions/lang-english/locale/flarum-sticky.yml index 916133cff..fda9f23d6 100644 --- a/extensions/lang-english/locale/flarum-sticky.yml +++ b/extensions/lang-english/locale/flarum-sticky.yml @@ -1,9 +1,29 @@ flarum-sticky: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Strings in this namespace are used by the admin interface. + admin: + + # These strings are used in the Permissions page of the admin interface. + permissions: + sticky_discussions_label: Sticky discussions + + # Strings in this namespace are used by the forum user interface. forum: - discussion_stickied_notification: "{username} stickied" - discussion_stickied_post: "{username} stickied the discussion." - discussion_unstickied_post: "{username} unstickied the discussion." - notify_discussion_stickied: Someone stickies a discussion I started - stickied: Sticky - sticky: Sticky - unsticky: Unsticky + + # These strings are displayed as tooltips for discussion badges. + badge: + sticky_tooltip: Sticky + + # These strings are used by the discussion control buttons. + discussion_controls: + sticky_button: Sticky + unsticky_button: Unsticky + + # These strings are displayed between posts in the post stream. + post_stream: + discussion_stickied_text: "{username} stickied the discussion." + discussion_unstickied_text: "{username} unstickied the discussion." From fa7aa742d4515b76600ce9dbc5f08746ffa35853 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Thu, 22 Oct 2015 09:39:25 +0900 Subject: [PATCH 041/272] Rename keys for badge tooltips - Shortens two key names for consistency with `badge:` namespace. - Supports https://github.com/flarum/core/pull/601 - Supports https://github.com/flarum/lock/pull/4 --- extensions/lang-english/locale/core.yml | 2 +- extensions/lang-english/locale/flarum-lock.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index a777fc456..82ab42328 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -322,7 +322,7 @@ core: # These strings are displayed as tooltips for discussion badges. badge: - hidden_discussion_tooltip: Hidden + hidden_tooltip: Hidden # This string is displayed in place of the username of deleted user account. deleted_user_text: "[deleted]" diff --git a/extensions/lang-english/locale/flarum-lock.yml b/extensions/lang-english/locale/flarum-lock.yml index 1171d9283..e752b38b5 100644 --- a/extensions/lang-english/locale/flarum-lock.yml +++ b/extensions/lang-english/locale/flarum-lock.yml @@ -16,7 +16,7 @@ flarum-lock: # These strings are displayed as tooltips for discussion badges. badge: - locked_discussion_tooltip: Locked + locked_tooltip: Locked # These strings are used by the discussion control buttons. discussion_controls: From 02d0b35173175e1c714e136ec59ff00d518af650 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Thu, 22 Oct 2015 10:00:21 +0900 Subject: [PATCH 042/272] Clean up reused "sticky" string - Adds a reused string and two references --- extensions/lang-english/locale/flarum-sticky.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/flarum-sticky.yml b/extensions/lang-english/locale/flarum-sticky.yml index fda9f23d6..360497538 100644 --- a/extensions/lang-english/locale/flarum-sticky.yml +++ b/extensions/lang-english/locale/flarum-sticky.yml @@ -16,14 +16,21 @@ flarum-sticky: # These strings are displayed as tooltips for discussion badges. badge: - sticky_tooltip: Sticky + sticky_tooltip: => flarum-sticky.ref.sticky # These strings are used by the discussion control buttons. discussion_controls: - sticky_button: Sticky + sticky_button: => flarum-sticky.ref.sticky unsticky_button: Unsticky # These strings are displayed between posts in the post stream. post_stream: discussion_stickied_text: "{username} stickied the discussion." discussion_unstickied_text: "{username} unstickied the discussion." + + ## + # REUSED STRINGS - The following keys are referenced by two or more unique keys. + ## + + ref: + sticky: Sticky From bb4ea258427ef382c702909844c6cc57b598227e Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Thu, 22 Oct 2015 15:19:50 +0900 Subject: [PATCH 043/272] Reorganize key names for Subscriptions See [flarum/core #265](https://github.com/flarum/core/issues/265). - Adjusts key names to three-tier namespacing. - Adds newly extracted strings. - Adds commenting to match core. --- .../locale/flarum-subscriptions.yml | 57 +++++++++++++++---- 1 file changed, 47 insertions(+), 10 deletions(-) diff --git a/extensions/lang-english/locale/flarum-subscriptions.yml b/extensions/lang-english/locale/flarum-subscriptions.yml index c9540f950..38ad6a0f7 100644 --- a/extensions/lang-english/locale/flarum-subscriptions.yml +++ b/extensions/lang-english/locale/flarum-subscriptions.yml @@ -1,14 +1,51 @@ flarum-subscriptions: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Strings in this namespace are used by the forum user interface. forum: + + # These strings are displayed as tooltips for discussion badges. + badge: + following_tooltip: => flarum-subscriptions.ref.following + ignoring_tooltip: => flarum-subscriptions.ref.ignoring + + # These strings are used by the discussion control buttons. + discussion_controls: + follow_button: => flarum-subscriptions.ref.follow + unfollow_button: Unfollow + unignore_button: Unignore + + # These strings are used on the index page, peripheral to the discussion list. + index: + following_link: => flarum-subscriptions.ref.following + + # These strings are used by the Notifications dropdown, a.k.a. "the bell". + notifications: + new_post_text: "{username} posted" + + # These strings are used in the Settings page. + settings: + notify_new_post_label: Someone posts in a discussion I'm following + + # These strings are used in the subscription menu displayed to the right of the post stream. + sub_controls: + follow_button: => flarum-subscriptions.ref.follow + following_button: => flarum-subscriptions.ref.following + following_text: Be notified of all replies. + ignoring_button: => flarum-subscriptions.ref.ignoring + ignoring_text: Never be notified. Hide from the discussion list. + not_following_button: Not Following + not_following_text: Be notified when @mentioned. + + ## + # REUSED STRINGS - These keys should not be used directly in code! + ## + + # Strings in this namespace are referenced by two or more unique keys. + ref: + follow: Follow following: Following ignoring: Ignoring - follow: Follow - unfollow: Unfollow - ignore: Ignore - notify_new_post: Someone posts in a discussion I'm following - new_post_notification: "{username} posted" - not_following: Not Following - not_following_description: Be notified when @mentioned. - following_description: Be notified of all replies. - ignoring_description: Never be notified. Hide from the discussion list. - unignore: Unignore From d0a0fe7e06d4092ba01be33ec79cf7a234115349 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Thu, 22 Oct 2015 15:26:58 +0900 Subject: [PATCH 044/272] Revise "reused strings" commenting to match core - Fixes commenting on two files where I accidentally used an old version. --- extensions/lang-english/locale/flarum-flags.yml | 3 ++- extensions/lang-english/locale/flarum-sticky.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml index 276f26131..9cf9f7bb6 100644 --- a/extensions/lang-english/locale/flarum-flags.yml +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -42,9 +42,10 @@ flarum-flags: flag_button: Flag ## - # REUSED STRINGS - The following keys are referenced by two or more unique keys. + # REUSED STRINGS - These keys should not be used directly in code! ## + # Strings in this namespace are referenced by two or more unique keys. ref: flag_post: Flag Post flagged_posts: Flagged Posts diff --git a/extensions/lang-english/locale/flarum-sticky.yml b/extensions/lang-english/locale/flarum-sticky.yml index 360497538..cb004cfab 100644 --- a/extensions/lang-english/locale/flarum-sticky.yml +++ b/extensions/lang-english/locale/flarum-sticky.yml @@ -29,8 +29,9 @@ flarum-sticky: discussion_unstickied_text: "{username} unstickied the discussion." ## - # REUSED STRINGS - The following keys are referenced by two or more unique keys. + # REUSED STRINGS - These keys should not be used directly in code! ## + # Strings in this namespace are referenced by two or more unique keys. ref: sticky: Sticky From 5861c95d08e7d59fb66f681f437dced9662db5b9 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 22 Oct 2015 16:56:59 +1030 Subject: [PATCH 045/272] Add rate limit (flood control) error message --- extensions/lang-english/locale/core.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 82ab42328..1c92835a9 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -332,8 +332,9 @@ core: generic_message: Oops! Something went wrong. Please reload the page and try again. permission_denied_message: You do not have permission to do that. not_found_message: The requested resource was not found. + rate_limit_exceeded_message: You're going a little too quickly. Please try again in a few seconds. - #These strings are used as suffixes when abbreviating numbers. + # These strings are used as suffixes when abbreviating numbers. number_suffix: kilo_text: K mega_text: M From 80de9f95c584c19e2e130f3533a1e2a509a8f7ef Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Fri, 23 Oct 2015 10:11:34 +0900 Subject: [PATCH 046/272] Reorganize key names for Tags See [flarum/core #265](https://github.com/flarum/core/issues/265). - Adjusts key names to three-tier namespacing. - Adds newly extracted strings. - Adds commenting to match core. - Supports https://github.com/flarum/tags/pull/22. - (Also adjusts one string in **flarum-subscriptions.yml**.) --- .../locale/flarum-subscriptions.yml | 2 +- .../lang-english/locale/flarum-tags.yml | 109 ++++++++++++++++-- 2 files changed, 98 insertions(+), 13 deletions(-) diff --git a/extensions/lang-english/locale/flarum-subscriptions.yml b/extensions/lang-english/locale/flarum-subscriptions.yml index 38ad6a0f7..321c01706 100644 --- a/extensions/lang-english/locale/flarum-subscriptions.yml +++ b/extensions/lang-english/locale/flarum-subscriptions.yml @@ -38,7 +38,7 @@ flarum-subscriptions: ignoring_button: => flarum-subscriptions.ref.ignoring ignoring_text: Never be notified. Hide from the discussion list. not_following_button: Not Following - not_following_text: Be notified when @mentioned. + not_following_text: Be notified only when @mentioned. ## # REUSED STRINGS - These keys should not be used directly in code! diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index 6b9c2f18a..c89707458 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -1,15 +1,100 @@ flarum-tags: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Strings in this namespace are used by the admin interface. + admin: + + # These strings are used in the Basics page. + basics: + tags_label: => flarum-tags.ref.tags + + # These strings are used in the Edit Tag modal dialog. + edit_tag: + color_label: Color + description_label: Description + delete_tag_button: Delete Tag + delete_tag_confirmation: Are you sure you want to delete this tag? The tag's discussions will NOT be deleted. + hide_label: Hide from All Discussions + name_label: => flarum-tags.ref.name + name_placeholder: => flarum-tags.ref.name + slug_label: Slug + submit_button: => core.ref.save_changes + title: => flarum-tags.ref.create_tag + + # These strings are used in the navigation bar. + nav: + tags_button: => flarum-tags.ref.tags + tags_text: Manage the list of tags available to organise discussions with. + + # These strings are used in the Permissions page of the admin interface. + permissions: + restrict_by_tag_heading: Restrict by Tag + tag_discussions_label: Tag discussions + + # These strings are used in the Tag Settings modal dialog. + tag_settings: + range_separator_text: " to " + required_primary_heading: Required Number of Primary Tags + required_primary_text: Enter the minimum and maximum number of primary tags that may be applied to a discussion. + required_secondary_heading: Required Number of Secondary Tags + required_secondary_text: Enter the minimum and maximum number of secondary tags that may be applied to a discussion. + title: Tag Settings + + # These strings are used in the Tags page. + tags: + about_tags_text: Tags are used to categorize discussions. Primary tags are like traditional forum categories: they can be arranged in a two-level hierarchy. Secondary tags do not have hierarchy or order, and are useful for micro-categorization. + create_tag_button: => flarum-tags.ref.create_tag + primary_heading: Primary Tags + secondary_heading: Secondary Tags + settings_button: Settings + + # Strings in this namespace are used by the forum user interface. forum: + + # These strings are used by the Choose Tags modal dialog. + choose_tags: + choose_primary_placeholder: "Choose a primary tag|Choose {count} primary tags" + choose_secondary_placeholder: "Choose 1 more tag|Choose {count} more tags" + edit_title: "Edit Tags for {title}" + submit_button: Confirm + title: Choose Tags for Your Discussion + + # These strings are used by the composer when starting a discussion. + composer_discussion: + choose_tags_link: Choose Tags + + # These strings are used by the discussion control buttons. + discussion_controls: + edit_tags_button: Edit Tags + + # These strings are used on the index page, peripheral to the discussion list. + index: + tags_link: => flarum-tags.ref.tags + more_link: More... + untagged_link: Untagged + + # These strings are displayed between posts in the post stream. + post_stream: + added_tags_text: "{username} added the {tagsAdded}." + added_and_removed_tags_text: "{username} added the {tagsAdded} and removed the {tagsRemoved}." + removed_tags_text: "{username} removed the {tagsRemoved}." + tags_text: "{tags} tag|{tags} tags" + + # Strings in this namespace are used by the forum and admin interfaces. + lib: + + # This string is displayed in place of the name of a tag that's been deleted. + deleted_tag_text: Deleted + + ## + # REUSED STRINGS - These keys should not be used directly in code! + ## + + # Strings in this namespace are referenced by two or more unique keys. + ref: + create_tag: Create Tag + name: Name tags: Tags - discussion_tagged_post: "{username} {action} tag.|{username} {action} tags." - added_tags: "added the {tags}" - removed_tags: "removed the {tags}" - tag_new_discussion_title: Choose Tags for Your Discussion - tag_new_discussion_link: Choose Tags - edit_discussion_tags_title: "Edit Tags for {title}" - edit_discussion_tags_link: Edit Tags - choose_primary_tags: "Choose a primary tag|Choose {count} primary tags" - choose_secondary_tags: "Choose 1 more tag|Choose {count} more tags" - confirm: Confirm - more: More... - deleted: Deleted From 1d83d4dc0d4c61a6f8b4a04ab2ae74fd18c6d45c Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Fri, 23 Oct 2015 11:31:53 +0900 Subject: [PATCH 047/272] Reorganize key names for Likes See [flarum/core #265](https://github.com/flarum/core/issues/265). - Adjusts key names to three-tier namespacing. - Adds newly extracted strings. - Adds commenting to match core. - Adds a comment to indicate a pluralizable string. - Supports https://github.com/flarum/likes/pull/3. --- .../lang-english/locale/flarum-likes.yml | 43 +++++++++++++++---- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/extensions/lang-english/locale/flarum-likes.yml b/extensions/lang-english/locale/flarum-likes.yml index de5198ef2..8dc5ef37a 100644 --- a/extensions/lang-english/locale/flarum-likes.yml +++ b/extensions/lang-english/locale/flarum-likes.yml @@ -1,11 +1,36 @@ flarum-likes: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Strings in this namespace are used by the admin interface. + admin: + + # These strings are used in the Permissions page of the admin interface. + permissions: + like_posts_label: Like posts + + # Strings in this namespace are used by the forum user interface. forum: - post_liked_notification: "{username} liked your post" - post_likes_modal_title: Users Who Like This - post_liked_by_self: "{users} like this." - post_liked_by: "{users} likes this.|{users} like this." - unlike_action: Unlike - like_action: Like - notify_post_liked: Someone likes my post - others: "{count} others" - you: You + + # These strings are used by the Notifications dropdown, a.k.a. "the bell". + notifications: + post_liked_text: "{username} liked your post" + + # These strings are displayed beneath individual posts. + post: + like_link: Like + liked_by_text: "{users} likes this.|{users} like this." + liked_by_self_text: "{users} like this." # Can be pluralized to agree with the number of users! + others_link: "{count} others" + unlike_link: Unlike + you_text: You + + # These strings are used by the Users Who Like This modal dialog. + post_likes: + title: Users Who Like This + + # These strings are used in the Settings page. + settings: + notify_post_liked_label: Someone likes my post From 06fcb39fb4ff383aabefac33704cd998b36a4367 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Fri, 23 Oct 2015 14:49:15 +0900 Subject: [PATCH 048/272] Reorganize key names for Mentions See [flarum/core #265](https://github.com/flarum/core/issues/265). - Adjusts key names to three-tier namespacing. - Adds newly extracted strings. - Adds commenting to match core. - Adds comments to indicate pluralizable strings. - Supports https://github.com/flarum/mentions/pull/12. --- .../lang-english/locale/flarum-mentions.yml | 44 +++++++++++++++---- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml index 6e30e4119..f3fe634bc 100644 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -1,11 +1,39 @@ flarum-mentions: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Strings in this namespace are used by the forum user interface. forum: - reply_to_post: "Reply to #{number}" - post_mentioned_notification: "{username} replied to your post" + + # These strings are used by the composer (reply autocompletion function). + composer: + reply_to_post_text: "Reply to #{number}" + + # These strings are used by the Notifications dropdown, a.k.a. "the bell". + notifications: + post_mentioned_text: "{username} replied to your post" + others_text: => flarum-mentions.ref.others + user_mentioned_text: "{username} mentioned you" + + # These strings are displayed beneath individual posts. + post: + mentioned_by_text: "{users} replied to this." # Can be pluralized to agree with the number of users! + mentioned_by_self_text: "{users} replied to this." # Can be pluralized to agree with the number of users! + others_link: => flarum-mentions.ref.others + reply_link: Reply + you_text: You + + # These strings are used in the Settings page. + settings: + notify_post_mentioned_label: Someone replies to my post + notify_user_mentioned_label: Someone mentions me in a post + + ## + # REUSED STRINGS - These keys should not be used directly in code! + ## + + # Strings in this namespace are referenced by two or more unique keys. + ref: others: "{count} others" - user_mentioned_notification: "{username} mentioned you" - post_mentioned_by: "{users} replied to this." - you: You - reply_link: Reply - notify_post_mentioned: Someone replies to my post - notify_user_mentioned: Someone mentions me in a post From 9b70bee805f8766fc04a821e0c5df67be788c3df Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Fri, 23 Oct 2015 15:18:23 +0900 Subject: [PATCH 049/272] Modify the label for the notification preference setting --- extensions/lang-english/locale/flarum-likes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-likes.yml b/extensions/lang-english/locale/flarum-likes.yml index 8dc5ef37a..9ab32e382 100644 --- a/extensions/lang-english/locale/flarum-likes.yml +++ b/extensions/lang-english/locale/flarum-likes.yml @@ -33,4 +33,4 @@ flarum-likes: # These strings are used in the Settings page. settings: - notify_post_liked_label: Someone likes my post + notify_post_liked_label: Someone likes one of my posts From 0016b737259226c068cae909fa9a73d53c21973d Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Fri, 23 Oct 2015 15:51:32 +0900 Subject: [PATCH 050/272] Pluralize the post mentioned notification string - Adds a comment to indicate a pluralizable string. - Supports https://github.com/flarum/mentions/pull/13. --- extensions/lang-english/locale/flarum-mentions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml index f3fe634bc..2eb87ba88 100644 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -13,7 +13,7 @@ flarum-mentions: # These strings are used by the Notifications dropdown, a.k.a. "the bell". notifications: - post_mentioned_text: "{username} replied to your post" + post_mentioned_text: "{username} replied to your post" # Can be pluralized to agree with the number of users! others_text: => flarum-mentions.ref.others user_mentioned_text: "{username} mentioned you" From 466e526161f7de3a5ae21817a346f5fa9f5ae488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Fri, 23 Oct 2015 08:54:07 +0200 Subject: [PATCH 051/272] Modify the label for the notification setting --- extensions/lang-english/locale/flarum-mentions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml index f3fe634bc..8ef705fd3 100644 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -27,7 +27,7 @@ flarum-mentions: # These strings are used in the Settings page. settings: - notify_post_mentioned_label: Someone replies to my post + notify_post_mentioned_label: Someone replies to one my posts notify_user_mentioned_label: Someone mentions me in a post ## From e6288800e16d58a7b642d1e3c1b5a9319e041ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Fri, 23 Oct 2015 08:56:56 +0200 Subject: [PATCH 052/272] Fix a missing word --- extensions/lang-english/locale/flarum-mentions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml index 8ef705fd3..8bc98d998 100644 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -27,7 +27,7 @@ flarum-mentions: # These strings are used in the Settings page. settings: - notify_post_mentioned_label: Someone replies to one my posts + notify_post_mentioned_label: Someone replies to one of my posts notify_user_mentioned_label: Someone mentions me in a post ## From 9c0a4447a7fdd09ccfe60bda9a3973d2bc1b03be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Fri, 23 Oct 2015 11:37:49 +0200 Subject: [PATCH 053/272] Merge Reply references into a reused string Two strings use *Reply*, it's not necessary to translate it twice. The newly `core.ref.reply` reused string fix that. --- extensions/lang-english/locale/core.yml | 3 ++- extensions/lang-english/locale/flarum-mentions.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 1c92835a9..02e80112f 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -170,7 +170,7 @@ core: log_in_to_reply_button: Log In to Reply rename_button: Rename rename_text: Enter a new title for this discussion: - reply_button: Reply + reply_button: => core.ref.reply restore_button: => core.ref.restore # These strings are used in the discussion list. @@ -374,6 +374,7 @@ core: notifications: Notifications okay: OK password: Password + reply: Reply restore: Restore save_changes: Save Changes settings: Settings diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml index 8bc98d998..141325df0 100644 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -22,7 +22,7 @@ flarum-mentions: mentioned_by_text: "{users} replied to this." # Can be pluralized to agree with the number of users! mentioned_by_self_text: "{users} replied to this." # Can be pluralized to agree with the number of users! others_link: => flarum-mentions.ref.others - reply_link: Reply + reply_link: => core.ref.reply you_text: You # These strings are used in the Settings page. From 5b70099030af1fe4f27976662f4022154cbe1674 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Fri, 23 Oct 2015 18:48:40 +0900 Subject: [PATCH 054/272] Use "OK" for submit button in Choose Tags modal --- extensions/lang-english/locale/flarum-tags.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index c89707458..57e9e4af1 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -59,7 +59,7 @@ flarum-tags: choose_primary_placeholder: "Choose a primary tag|Choose {count} primary tags" choose_secondary_placeholder: "Choose 1 more tag|Choose {count} more tags" edit_title: "Edit Tags for {title}" - submit_button: Confirm + submit_button: => core.ref.okay title: Choose Tags for Your Discussion # These strings are used by the composer when starting a discussion. From 07c849e7800432bc58f0d853f7a2f1c6afe3aa26 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sat, 24 Oct 2015 10:14:20 +0900 Subject: [PATCH 055/272] Merge reused strings into core - Merges two strings from Likes and Mentions into the core YML. - Adds commenting to core YML to indicate strings referenced by extensions. - Changes `others_link` to `others_text` in Mentions. - Removes obsolete `ref:` namespace from Mentions. --- extensions/lang-english/locale/core.yml | 6 ++++-- extensions/lang-english/locale/flarum-likes.yml | 4 ++-- extensions/lang-english/locale/flarum-mentions.yml | 14 +++----------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 02e80112f..d4df3cbcb 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -374,13 +374,15 @@ core: notifications: Notifications okay: OK password: Password - reply: Reply + reply: Reply # Referenced by flarum-mentions.yml restore: Restore - save_changes: Save Changes + save_changes: Save Changes # Referenced by flarum-tags.yml settings: Settings sign_up: Sign Up + some_others: "{count} other|{count} others" # Referenced by flarum-likes.yml, flarum-mentions.yml username: Username write_a_reply: Write a Reply... + you: You # Referenced by flarum-likes.yml, flarum-mentions.yml ## # EMAIL CONTENT diff --git a/extensions/lang-english/locale/flarum-likes.yml b/extensions/lang-english/locale/flarum-likes.yml index 9ab32e382..c6cd7e6ef 100644 --- a/extensions/lang-english/locale/flarum-likes.yml +++ b/extensions/lang-english/locale/flarum-likes.yml @@ -23,9 +23,9 @@ flarum-likes: like_link: Like liked_by_text: "{users} likes this.|{users} like this." liked_by_self_text: "{users} like this." # Can be pluralized to agree with the number of users! - others_link: "{count} others" + others_link: => core.ref.some_others unlike_link: Unlike - you_text: You + you_text: => core.ref.you # These strings are used by the Users Who Like This modal dialog. post_likes: diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml index 141325df0..405f07b5e 100644 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -14,26 +14,18 @@ flarum-mentions: # These strings are used by the Notifications dropdown, a.k.a. "the bell". notifications: post_mentioned_text: "{username} replied to your post" - others_text: => flarum-mentions.ref.others + others_text: => core.ref.some_others user_mentioned_text: "{username} mentioned you" # These strings are displayed beneath individual posts. post: mentioned_by_text: "{users} replied to this." # Can be pluralized to agree with the number of users! mentioned_by_self_text: "{users} replied to this." # Can be pluralized to agree with the number of users! - others_link: => flarum-mentions.ref.others + others_text: => core.ref.some_others reply_link: => core.ref.reply - you_text: You + you_text: => core.ref.you # These strings are used in the Settings page. settings: notify_post_mentioned_label: Someone replies to one of my posts notify_user_mentioned_label: Someone mentions me in a post - - ## - # REUSED STRINGS - These keys should not be used directly in code! - ## - - # Strings in this namespace are referenced by two or more unique keys. - ref: - others: "{count} others" From b3dbe065c40133881e433e7f27dc7638c9b14536 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sat, 24 Oct 2015 11:11:44 +0900 Subject: [PATCH 056/272] Add an "others" key for Likes notifications - Adds a key I overlooked in the reorganization. --- extensions/lang-english/locale/flarum-likes.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/flarum-likes.yml b/extensions/lang-english/locale/flarum-likes.yml index c6cd7e6ef..f44342328 100644 --- a/extensions/lang-english/locale/flarum-likes.yml +++ b/extensions/lang-english/locale/flarum-likes.yml @@ -17,6 +17,7 @@ flarum-likes: # These strings are used by the Notifications dropdown, a.k.a. "the bell". notifications: post_liked_text: "{username} liked your post" + others_text: => core.ref.some_others # These strings are displayed beneath individual posts. post: From edc98bfe716142e500c2ef3b7956bf9c8fefcd94 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sat, 24 Oct 2015 12:36:30 +0900 Subject: [PATCH 057/272] Pluralize the post liked notification string - Adds a comment to indicate a pluralizable string. - Supports https://github.com/flarum/likes/commit/e867b54. --- extensions/lang-english/locale/flarum-likes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-likes.yml b/extensions/lang-english/locale/flarum-likes.yml index f44342328..ac91e2715 100644 --- a/extensions/lang-english/locale/flarum-likes.yml +++ b/extensions/lang-english/locale/flarum-likes.yml @@ -16,7 +16,7 @@ flarum-likes: # These strings are used by the Notifications dropdown, a.k.a. "the bell". notifications: - post_liked_text: "{username} liked your post" + post_liked_text: "{username} liked your post" # Can be pluralized to agree with the number of users! others_text: => core.ref.some_others # These strings are displayed beneath individual posts. From 5ff4c1fd6472b484ca532440ba60626938868d75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Wed, 28 Oct 2015 14:26:56 +0100 Subject: [PATCH 058/272] Quote values with special or reserved characters Quotes are required when the string contains special or reserved characters (`:`, `{`, `}`, `[`, `]`, `,`, `&`, `*`, `#`, `?`, `|`, `-`, `<`, `>`, `=`, `!`, `%`, `@`, and `\`). See: http://symfony.com/doc/current/components/yaml/yaml_format.html#strings --- extensions/lang-english/locale/core.yml | 28 +++++++++---------- .../lang-english/locale/flarum-flags.yml | 2 +- .../locale/flarum-subscriptions.yml | 2 +- .../lang-english/locale/flarum-tags.yml | 4 +-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index d4df3cbcb..4abc1fb58 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -11,7 +11,7 @@ core: appearance: colored_header_label: Colored Header colors_heading: Colors - colors_text: Choose two colors to theme your forum with. The first will be used as a highlight color, while the second will be used to style background elements. + colors_text: "Choose two colors to theme your forum with. The first will be used as a highlight color, while the second will be used to style background elements." custom_styles_heading: Custom Styles custom_styles_text: Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles. dark_mode_label: Dark Mode @@ -27,7 +27,7 @@ core: forum_description_text: Enter a short sentence or two that describes your community. This will appear in the meta tag and show up in search engines. forum_title_heading: Forum Title home_page_heading: Home Page - home_page_text: Choose the page which users will first see when they visit your forum. If entering a custom value, use the path relative to the forum root. + home_page_text: "Choose the page which users will first see when they visit your forum. If entering a custom value, use the path relative to the forum root." saved_message: Your changes were saved. submit_button: => core.ref.save_changes welcome_banner_heading: Welcome Banner @@ -47,7 +47,7 @@ core: edit_group: color_label: Color delete_button: Delete Group - delete_confirmation: Are you sure you want to delete this group? The group members will NOT be deleted. + delete_confirmation: "Are you sure you want to delete this group? The group members will NOT be deleted." icon_label: Icon icon_text: "Enter the name of any FontAwesome icon class, without the fa- prefix." name_label: Name @@ -75,9 +75,9 @@ core: # These strings are used in the navigation bar. nav: appearance_button: Appearance - appearance_text: Customize your forum's colors, logos, and other variables. + appearance_text: "Customize your forum's colors, logos, and other variables." basics_button: Basics - basics_text: Set your forum title, language, and other basic settings. + basics_text: "Set your forum title, language, and other basic settings." dashboard_button: Dashboard dashboard_text: Your forum at a glance. extensions_button: Extensions @@ -142,20 +142,20 @@ core: # These strings are used by the composer when starting a discussion. composer_discussion: body_placeholder: Write a Post... - discard_confirmation: You have not posted your discussion. Do you wish to discard it? + discard_confirmation: "You have not posted your discussion. Do you wish to discard it?" submit_button: Post Discussion title_placeholder: Discussion Title # These strings are used by the composer when editing a post. composer_edit: - discard_confirmation: You have not saved your changes. Do you wish to discard them? + discard_confirmation: "You have not saved your changes. Do you wish to discard them?" post_link: "Post #{number} in {discussion}" submit_button: => core.ref.save_changes # These strings are used by the composer when replying to a discussion. composer_reply: body_placeholder: => core.ref.write_a_reply - discard_confirmation: You have not posted your reply. Do you wish to discard it? + discard_confirmation: "You have not posted your reply. Do you wish to discard it?" posted_message: Your reply was posted. submit_button: Post Reply view_button: View @@ -165,17 +165,17 @@ core: cannot_reply_button: Can't Reply cannot_reply_text: You don't have permission to reply to this discussion. delete_button: => core.ref.delete - delete_confirmation: Are you sure you want to delete this discussion? + delete_confirmation: "Are you sure you want to delete this discussion?" delete_forever_button: => core.ref.delete_forever log_in_to_reply_button: Log In to Reply rename_button: Rename - rename_text: Enter a new title for this discussion: + rename_text: "Enter a new title for this discussion:" reply_button: => core.ref.reply restore_button: => core.ref.restore # These strings are used in the discussion list. discussion_list: - empty_text: Looks like there are no discussions here. Why don't you create a new one? + empty_text: "Looks like there are no discussions here. Why don't you create a new one?" load_more_button: => core.ref.load_more mark_as_read_tooltip: Mark as Read replied_text: "{username} replied {ago}" @@ -226,7 +226,7 @@ core: # These strings are used in the Log In modal dialog. log_in: confirmation_required_message: "You need to confirm your email before you can log in. We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." - forgot_password_link: Forgot password? + forgot_password_link: "Forgot password?" invalid_login_message: Your login details were incorrect. password_placeholder: => core.ref.password sign_up_text: "Don't have an account? Sign Up" @@ -314,7 +314,7 @@ core: user_controls: button: Controls delete_button: => core.ref.delete - delete_confirmation: Are you sure you want to delete this user? All of the user's posts will be deleted. + delete_confirmation: "Are you sure you want to delete this user? All of the user's posts will be deleted." edit_button: => core.ref.edit # Strings in this namespace are used by the forum and admin interfaces. @@ -329,7 +329,7 @@ core: # These strings are displayed as error messages. error: - generic_message: Oops! Something went wrong. Please reload the page and try again. + generic_message: "Oops! Something went wrong. Please reload the page and try again." permission_denied_message: You do not have permission to do that. not_found_message: The requested resource was not found. rate_limit_exceeded_message: You're going a little too quickly. Please try again in a few seconds. diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml index 9cf9f7bb6..e09a02ffa 100644 --- a/extensions/lang-english/locale/flarum-flags.yml +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -19,7 +19,7 @@ flarum-flags: flag_post: reason_heading: Choose a Reason reason_inappropriate_label: Inappropriate - reason_off_topic_label: Off-topic + reason_off_topic_label: "Off-topic" reason_other_label: Other reason_spam_label: Spam submit_button: => flarum-flags.ref.flag_post diff --git a/extensions/lang-english/locale/flarum-subscriptions.yml b/extensions/lang-english/locale/flarum-subscriptions.yml index 321c01706..ee6a23b5d 100644 --- a/extensions/lang-english/locale/flarum-subscriptions.yml +++ b/extensions/lang-english/locale/flarum-subscriptions.yml @@ -38,7 +38,7 @@ flarum-subscriptions: ignoring_button: => flarum-subscriptions.ref.ignoring ignoring_text: Never be notified. Hide from the discussion list. not_following_button: Not Following - not_following_text: Be notified only when @mentioned. + not_following_text: "Be notified only when @mentioned." ## # REUSED STRINGS - These keys should not be used directly in code! diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index 57e9e4af1..2b0954aa2 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -16,7 +16,7 @@ flarum-tags: color_label: Color description_label: Description delete_tag_button: Delete Tag - delete_tag_confirmation: Are you sure you want to delete this tag? The tag's discussions will NOT be deleted. + delete_tag_confirmation: "Are you sure you want to delete this tag? The tag's discussions will NOT be deleted." hide_label: Hide from All Discussions name_label: => flarum-tags.ref.name name_placeholder: => flarum-tags.ref.name @@ -45,7 +45,7 @@ flarum-tags: # These strings are used in the Tags page. tags: - about_tags_text: Tags are used to categorize discussions. Primary tags are like traditional forum categories: they can be arranged in a two-level hierarchy. Secondary tags do not have hierarchy or order, and are useful for micro-categorization. + about_tags_text: "Tags are used to categorize discussions. Primary tags are like traditional forum categories: they can be arranged in a two-level hierarchy. Secondary tags do not have hierarchy or order, and are useful for micro-categorization." create_tag_button: => flarum-tags.ref.create_tag primary_heading: Primary Tags secondary_heading: Secondary Tags From 8b819c21ca33f326071a0eed36f8797dbad3eb67 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 3 Nov 2015 16:01:43 +1030 Subject: [PATCH 059/272] Change flag post modal "Reason" heading --- extensions/lang-english/locale/flarum-flags.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml index e09a02ffa..8c8760153 100644 --- a/extensions/lang-english/locale/flarum-flags.yml +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -17,7 +17,7 @@ flarum-flags: # These strings are used by the Flag Post modal dialog. flag_post: - reason_heading: Choose a Reason + reason_heading: Reason reason_inappropriate_label: Inappropriate reason_off_topic_label: "Off-topic" reason_other_label: Other From 850ba9fdc0f9cd8cefe4cfe17693b74f67aa5bb6 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 3 Nov 2015 17:18:18 +1030 Subject: [PATCH 060/272] Add translation for "Follow" button tooltip --- extensions/lang-english/locale/flarum-subscriptions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/locale/flarum-subscriptions.yml b/extensions/lang-english/locale/flarum-subscriptions.yml index ee6a23b5d..f82d0a6ed 100644 --- a/extensions/lang-english/locale/flarum-subscriptions.yml +++ b/extensions/lang-english/locale/flarum-subscriptions.yml @@ -39,6 +39,8 @@ flarum-subscriptions: ignoring_text: Never be notified. Hide from the discussion list. not_following_button: Not Following not_following_text: "Be notified only when @mentioned." + notify_email_tooltip: Get an email when there are new posts + notify_alert_tooltip: Get a forum notification when there are new posts ## # REUSED STRINGS - These keys should not be used directly in code! From 931c80dad06b02c6aa531aa067f15c39269be6c0 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 3 Nov 2015 18:13:43 +1030 Subject: [PATCH 061/272] Add translation for loading indicator --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 4abc1fb58..7c27c76ae 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -347,6 +347,7 @@ core: # Strings in this namespace are used in basic HTML interface. basic: + loading_text: "Loading..." load_error_message: Something went wrong while trying to load the full version of this site. javascript_disabled_message: This site is best viewed in a modern browser with JavaScript enabled. next_page_button: Next Page From 78283565a6e11ee9122028ed322f8f58461dcb27 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 4 Nov 2015 09:07:58 +1030 Subject: [PATCH 062/272] Remove unnecessary quotes --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 7c27c76ae..e82cb85e2 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -347,7 +347,7 @@ core: # Strings in this namespace are used in basic HTML interface. basic: - loading_text: "Loading..." + loading_text: Loading... load_error_message: Something went wrong while trying to load the full version of this site. javascript_disabled_message: This site is best viewed in a modern browser with JavaScript enabled. next_page_button: Next Page From 689ec697edcad32032223a1fb433a3484ea10883 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 4 Nov 2015 13:00:11 +1030 Subject: [PATCH 063/272] Add new translations for flag settings and reason descriptions --- extensions/lang-english/locale/flarum-flags.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml index 8c8760153..8752c60f3 100644 --- a/extensions/lang-english/locale/flarum-flags.yml +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -12,16 +12,25 @@ flarum-flags: flag_posts_label: Flag posts view_flags_label: View flagged posts + # These strings are used in the Flags Settings modal dialog. + settings: + guidelines_url_label: Community Guidelines URL + title: Flags Settings + # Strings in this namespace are used by the forum user interface. forum: # These strings are used by the Flag Post modal dialog. flag_post: - reason_heading: Reason + confirmation_message: "Thank you for flagging this post. Our moderators will look into it." + dismiss_button: => core.ref.okay reason_inappropriate_label: Inappropriate + reason_inappropriate_text: "This post is offensive, abusive, or violates our community guidelines." reason_off_topic_label: "Off-topic" + reason_off_topic_text: "This post is not relevant to the current discussion and should be moved elsewhere." reason_other_label: Other reason_spam_label: Spam + reason_spam_text: This post is an advertisement. submit_button: => flarum-flags.ref.flag_post title: => flarum-flags.ref.flag_post From e2763c3b5a3269fb2df254e088423d886687c2bf Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 4 Nov 2015 18:34:12 +1030 Subject: [PATCH 064/272] Remove unnecessary quotes --- extensions/lang-english/locale/flarum-flags.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml index 8752c60f3..936a94f9b 100644 --- a/extensions/lang-english/locale/flarum-flags.yml +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -22,12 +22,12 @@ flarum-flags: # These strings are used by the Flag Post modal dialog. flag_post: - confirmation_message: "Thank you for flagging this post. Our moderators will look into it." + confirmation_message: Thank you for flagging this post. Our moderators will look into it. dismiss_button: => core.ref.okay reason_inappropriate_label: Inappropriate reason_inappropriate_text: "This post is offensive, abusive, or violates our community guidelines." reason_off_topic_label: "Off-topic" - reason_off_topic_text: "This post is not relevant to the current discussion and should be moved elsewhere." + reason_off_topic_text: This post is not relevant to the current discussion and should be moved elsewhere. reason_other_label: Other reason_spam_label: Spam reason_spam_text: This post is an advertisement. From 7319073f10d8107e0b3195c4aa765115c9f74bd6 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Thu, 5 Nov 2015 07:49:39 +0900 Subject: [PATCH 065/272] Add comment to core.ref.okay - Adds a comment to indicate use by Tags extension --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index e82cb85e2..5dad592b0 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -373,7 +373,7 @@ core: log_out: Log Out mark_all_as_read: Mark All as Read notifications: Notifications - okay: OK + okay: OK # Referenced by flarum-tags.yml password: Password reply: Reply # Referenced by flarum-mentions.yml restore: Restore From aee5189abf54e507d7670274b2117517c97dee76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Fri, 6 Nov 2015 04:06:30 +0100 Subject: [PATCH 066/272] Add Flarum's Core as a requirement --- extensions/lang-english/composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 613b0647e..d735b6553 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -4,6 +4,9 @@ "description": "English language pack.", "keywords": ["locale"], "license": "MIT", + "require": { + "flarum/core": "^0.1.0-beta.4" + }, "extra": { "flarum-extension": { "title": "English", From d81100b21c60da80df72125d4f0c9b99ca80249f Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 6 Nov 2015 10:25:25 +0100 Subject: [PATCH 067/272] Fix broken link --- extensions/lang-english/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/README.md b/extensions/lang-english/README.md index b7e8e906e..9a716abd4 100644 --- a/extensions/lang-english/README.md +++ b/extensions/lang-english/README.md @@ -2,7 +2,7 @@ ## Installation -This language pack is bundled with [Flarum](http://flarum.org/download/). +This language pack is bundled with [Flarum](http://flarum.org/). ## Translating Flarum From 77d7c193868df58d4291e10434d619532840e0a8 Mon Sep 17 00:00:00 2001 From: David Bohn Date: Thu, 19 Nov 2015 22:37:12 +0100 Subject: [PATCH 068/272] Added language key for allowing edit of tags. Part of fix for flarum/core#330 --- extensions/lang-english/locale/flarum-tags.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index 2b0954aa2..39781cb51 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -33,6 +33,7 @@ flarum-tags: permissions: restrict_by_tag_heading: Restrict by Tag tag_discussions_label: Tag discussions + allow_edit_tags_label: Allow edit tags # These strings are used in the Tag Settings modal dialog. tag_settings: From 342ad776dace786605e9695c03791fd3020478e7 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 20 Nov 2015 12:37:20 +1030 Subject: [PATCH 069/272] Add new core translation --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 5dad592b0..dad5b4742 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -264,6 +264,7 @@ core: # These strings are displayed between posts in the post stream. post_stream: discussion_renamed_text: "{username} changed the title from {old} to {new}." + load_more_button: => core.ref.load_more reply_placeholder: => core.ref.write_a_reply time_lapsed_text: "{period} later" From f79844d1e36aa0f9067ba527bea65a676fc45358 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 21 Nov 2015 13:17:47 +1030 Subject: [PATCH 070/272] Add translation for discussion composer title Extracts "Start a Discussion" into a reference variable --- extensions/lang-english/locale/core.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index dad5b4742..6e18c2484 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -144,6 +144,7 @@ core: body_placeholder: Write a Post... discard_confirmation: "You have not posted your discussion. Do you wish to discard it?" submit_button: Post Discussion + title: => core.ref.start_a_discussion title_placeholder: Discussion Title # These strings are used by the composer when editing a post. @@ -213,7 +214,7 @@ core: cannot_start_discussion_button: Can't Start Discussion mark_all_as_read_tooltip: => core.ref.mark_all_as_read refresh_tooltip: Refresh - start_discussion_button: Start a Discussion + start_discussion_button: => core.ref.start_a_discussion # These strings are used by the sorting control above the discussion list. index_sort: @@ -381,6 +382,7 @@ core: save_changes: Save Changes # Referenced by flarum-tags.yml settings: Settings sign_up: Sign Up + start_a_discussion: Start a Discussion some_others: "{count} other|{count} others" # Referenced by flarum-likes.yml, flarum-mentions.yml username: Username write_a_reply: Write a Reply... From dda09653ab0ab9312f07dce7237a57fd56f0e530 Mon Sep 17 00:00:00 2001 From: David Bohn Date: Sat, 21 Nov 2015 14:17:03 +0100 Subject: [PATCH 071/272] Update translation according to suggestions --- extensions/lang-english/locale/flarum-tags.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index 39781cb51..20ccca7d8 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -33,7 +33,7 @@ flarum-tags: permissions: restrict_by_tag_heading: Restrict by Tag tag_discussions_label: Tag discussions - allow_edit_tags_label: Allow edit tags + allow_edit_tags_label: Allow tag editing # These strings are used in the Tag Settings modal dialog. tag_settings: From 41b1334e20876b60f10449fd31437b775125d767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Wed, 25 Nov 2015 12:30:00 +0100 Subject: [PATCH 072/272] Do not ask to create a new discussion anymore --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 5dad592b0..f9bd6ae24 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -175,7 +175,7 @@ core: # These strings are used in the discussion list. discussion_list: - empty_text: "Looks like there are no discussions here. Why don't you create a new one?" + empty_text: "It looks like there are no discussions here." load_more_button: => core.ref.load_more mark_as_read_tooltip: Mark as Read replied_text: "{username} replied {ago}" From a2d6f82ad469b87951eb1a62cc40560789cec680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Wed, 25 Nov 2015 13:34:33 +0100 Subject: [PATCH 073/272] Add "required_unless" lang line --- extensions/lang-english/locale/validation.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index 6d0b0a5ac..7a4847d22 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -43,6 +43,7 @@ validation: regex: "The :attribute format is invalid." required: "The :attribute field is required." required_if: "The :attribute field is required when :other is :value." + required_unless: "The :attribute field is required unless :other is in :values." required_with: "The :attribute field is required when :values is present." required_with_all: "The :attribute field is required when :values is present." required_without: "The :attribute field is required when :values is not present." From 42eb6e3c43acaf85b0ac487a81c8ec42fd31afc2 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sat, 28 Nov 2015 13:48:02 +0900 Subject: [PATCH 074/272] English revamp for i18n docs - Moves `ref` below `email`, adjacent to `group`. - Deletes block comment for `email` namespace. - Adds detail to block comment for `group`. - Changes "string" to "translation" in all files. --- extensions/lang-english/locale/core.yml | 178 +++++++++--------- .../lang-english/locale/flarum-flags.yml | 20 +- .../lang-english/locale/flarum-likes.yml | 14 +- .../lang-english/locale/flarum-lock.yml | 16 +- .../lang-english/locale/flarum-mentions.yml | 10 +- .../lang-english/locale/flarum-pusher.yml | 8 +- .../lang-english/locale/flarum-sticky.yml | 16 +- .../locale/flarum-subscriptions.yml | 18 +- .../lang-english/locale/flarum-tags.yml | 32 ++-- 9 files changed, 154 insertions(+), 158 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 6be8a445c..fed88e38e 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -4,10 +4,10 @@ core: # UNIQUE KEYS - The following keys are used in only one location each. ## - # Strings in this namespace are used by the admin interface. + # Translations in this namespace are used by the admin interface. admin: - # These strings are used in the Appearance page. + # These translations are used in the Appearance page. appearance: colored_header_label: Colored Header colors_heading: Colors @@ -19,7 +19,7 @@ core: enter_hex_message: Please enter a hexadecimal color code. submit_button: => core.ref.save_changes - # These strings are used in the Basics page. + # These translations are used in the Basics page. basics: all_discussions_label: => core.ref.all_discussions default_language_heading: Default Language @@ -33,7 +33,7 @@ core: welcome_banner_heading: Welcome Banner welcome_banner_text: Configure the text that displays in the banner on the All Discussions page. Use this to welcome guests to your forum. - # These strings are used in the Dashboard page. + # These translations are used in the Dashboard page. dashboard: beta_warning_text: "This beta software is provided primarily so that you can help us test it and make it better; it should not be used in production." contributing_text: "Want to look for bugs and contribute? Read the Contributing docs." @@ -43,7 +43,7 @@ core: troubleshooting_text: "Having problems? Follow the instructions in the Troubleshooting docs." version_text: "Thanks for trying out Flarum! You are running version {version}." - # These strings are used in the Edit Group modal dialog. + # These translations are used in the Edit Group modal dialog. edit_group: color_label: Color delete_button: Delete Group @@ -56,7 +56,7 @@ core: submit_button: => core.ref.save_changes title: Create Group - # These strings are used in the Extensions page. + # These translations are used in the Extensions page. extensions: add_button: Add Extension disable_button: Disable @@ -72,7 +72,7 @@ core: loading: title: Please Wait... - # These strings are used in the navigation bar. + # These translations are used in the navigation bar. nav: appearance_button: Appearance appearance_text: "Customize your forum's colors, logos, and other variables." @@ -85,7 +85,7 @@ core: permissions_button: Permissions permissions_text: Configure who can see and do what. - # These strings are used in the Permissions page of the admin interface. + # These translations are used in the Permissions page of the admin interface. permissions: allow_renaming_label: Allow renaming allow_post_editing_label: Allow post editing @@ -105,7 +105,7 @@ core: start_discussions_label: Start discussions view_discussions_label: View discussions - # These strings are used in the dropdown menus on the Permissions page. + # These translations are used in the dropdown menus on the Permissions page. permissions_controls: allow_indefinitely_button: Indefinitely allow_some_minutes_button: "For {count} minute|For {count} minutes" @@ -116,30 +116,30 @@ core: signup_closed_button: Closed signup_open_button: Open - # Strings in this namespace are used by the forum user interface. + # Translations in this namespace are used by the forum user interface. forum: - # These strings are used in the Change Email modal dialog. + # These translations are used in the Change Email modal dialog. change_email: confirmation_message: => core.ref.confirmation_email_sent dismiss_button: => core.ref.okay submit_button: => core.ref.save_changes title: => core.ref.change_email - # These strings are used in the Change Password modal dialog. + # These translations are used in the Change Password modal dialog. change_password: send_button: Send Password Reset Email text: Click the button below and check your email for a link to change your password. title: => core.ref.change_password - # These strings are used by the composer controls. + # These translations are used by the composer controls. composer: close_tooltip: Close exit_full_screen_tooltip: Exit Full Screen full_screen_tooltip: Full Screen minimize_tooltip: Minimize - # These strings are used by the composer when starting a discussion. + # These translations are used by the composer when starting a discussion. composer_discussion: body_placeholder: Write a Post... discard_confirmation: "You have not posted your discussion. Do you wish to discard it?" @@ -147,13 +147,13 @@ core: title: => core.ref.start_a_discussion title_placeholder: Discussion Title - # These strings are used by the composer when editing a post. + # These translations are used by the composer when editing a post. composer_edit: discard_confirmation: "You have not saved your changes. Do you wish to discard them?" post_link: "Post #{number} in {discussion}" submit_button: => core.ref.save_changes - # These strings are used by the composer when replying to a discussion. + # These translations are used by the composer when replying to a discussion. composer_reply: body_placeholder: => core.ref.write_a_reply discard_confirmation: "You have not posted your reply. Do you wish to discard it?" @@ -161,7 +161,7 @@ core: submit_button: Post Reply view_button: View - # These strings are used by the discussion control buttons. + # These translations are used by the discussion control buttons. discussion_controls: cannot_reply_button: Can't Reply cannot_reply_text: You don't have permission to reply to this discussion. @@ -174,7 +174,7 @@ core: reply_button: => core.ref.reply restore_button: => core.ref.restore - # These strings are used in the discussion list. + # These translations are used in the discussion list. discussion_list: empty_text: "It looks like there are no discussions here." load_more_button: => core.ref.load_more @@ -182,14 +182,14 @@ core: replied_text: "{username} replied {ago}" started_text: "{username} started {ago}" - # These strings are used in the Edit User modal dialog (admin function). + # These translations are used in the Edit User modal dialog (admin function). edit_user: email_label: => core.ref.email password_label: => core.ref.password submit_button: => core.ref.save_changes username_label: => core.ref.username - # These strings are used in the Forgot Password modal dialog. + # These translations are used in the Forgot Password modal dialog. forgot_password: dismiss_button: => core.ref.okay email_placeholder: => core.ref.email @@ -198,7 +198,7 @@ core: text: Enter your email address and we will send you a link to reset your password. title: Forgot Password - # These strings are used in the header and session dropdown menu. + # These translations are used in the header and session dropdown menu. header: admin_button: Administration log_in_link: => core.ref.log_in @@ -208,7 +208,7 @@ core: settings_button: => core.ref.settings sign_up_link: => core.ref.sign_up - # These strings are used on the index page, peripheral to the discussion list. + # These translations are used on the index page, peripheral to the discussion list. index: all_discussions_link: => core.ref.all_discussions cannot_start_discussion_button: Can't Start Discussion @@ -216,7 +216,7 @@ core: refresh_tooltip: Refresh start_discussion_button: => core.ref.start_a_discussion - # These strings are used by the sorting control above the discussion list. + # These translations are used by the sorting control above the discussion list. index_sort: latest_button: Latest newest_button: Newest @@ -224,7 +224,7 @@ core: relevance_button: Relevance top_button: Top - # These strings are used in the Log In modal dialog. + # These translations are used in the Log In modal dialog. log_in: confirmation_required_message: "You need to confirm your email before you can log in. We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." forgot_password_link: "Forgot password?" @@ -235,7 +235,7 @@ core: title: => core.ref.log_in username_or_email_placeholder: Username or Email - # These strings are used by the Notifications dropdown, a.k.a. "the bell". + # These translations are used by the Notifications dropdown, a.k.a. "the bell". notifications: discussion_renamed_text: "{username} changed the title" empty_text: No Notifications @@ -243,39 +243,39 @@ core: title: => core.ref.notifications tooltip: => core.ref.notifications - # These strings are used by tooltips displayed for individual posts. + # These translations are used by tooltips displayed for individual posts. post: edited_tooltip: "{username} edited {ago}" number_tooltip: "Post #{number}" - # These strings are used by the post control buttons. + # These translations are used by the post control buttons. post_controls: delete_button: => core.ref.delete delete_forever_button: => core.ref.delete_forever edit_button: => core.ref.edit restore_button: => core.ref.restore - # These strings are used in the scrubber to the right of the post stream. + # These translations are used in the scrubber to the right of the post stream. post_scrubber: now_link: Now original_post_link: Original Post unread_text: "{count} unread" viewing_text: "{index} of {count} post|{index} of {count} posts" - # These strings are displayed between posts in the post stream. + # These translations are displayed between posts in the post stream. post_stream: discussion_renamed_text: "{username} changed the title from {old} to {new}." load_more_button: => core.ref.load_more reply_placeholder: => core.ref.write_a_reply time_lapsed_text: "{period} later" - # These strings are used by the search results dropdown list. + # These translations are used by the search results dropdown list. search: all_discussions_button: 'Search all discussions for "{query}"' discussions_heading: => core.ref.discussions users_heading: Users - # These strings are used in the Settings page. + # These translations are used in the Settings page. settings: account_heading: Account change_email_button: => core.ref.change_email @@ -288,7 +288,7 @@ core: privacy_heading: Privacy title: => core.ref.settings - # These strings are used in the Sign Up modal dialog. + # These translations are used in the Sign Up modal dialog. sign_up: confirmation_message: => core.ref.confirmation_email_sent email_placeholder: => core.ref.email @@ -300,7 +300,7 @@ core: username_placeholder: => core.ref.username welcome_text: "Welcome, {username}!" - # These strings are used in the user profile page and profile popup. + # These translations are used in the user profile page and profile popup. user: avatar_remove_button: Remove avatar_upload_button: Upload @@ -312,42 +312,42 @@ core: posts_link: Posts settings_link: => core.ref.settings - # These strings are found on the user profile page (admin function). + # These translations are found on the user profile page (admin function). user_controls: button: Controls delete_button: => core.ref.delete delete_confirmation: "Are you sure you want to delete this user? All of the user's posts will be deleted." edit_button: => core.ref.edit - # Strings in this namespace are used by the forum and admin interfaces. + # Translations in this namespace are used by the forum and admin interfaces. lib: - # These strings are displayed as tooltips for discussion badges. + # These translations are displayed as tooltips for discussion badges. badge: hidden_tooltip: Hidden # This string is displayed in place of the username of deleted user account. deleted_user_text: "[deleted]" - # These strings are displayed as error messages. + # These translations are displayed as error messages. error: generic_message: "Oops! Something went wrong. Please reload the page and try again." permission_denied_message: You do not have permission to do that. not_found_message: The requested resource was not found. rate_limit_exceeded_message: You're going a little too quickly. Please try again in a few seconds. - # These strings are used as suffixes when abbreviating numbers. + # These translations are used as suffixes when abbreviating numbers. number_suffix: kilo_text: K mega_text: M - # These strings are used to punctuate a series of items. + # These translations are used to punctuate a series of items. series: glue_text: ", " two_text: "{first} and {second}" three_text: "{first}, {second}, and {third}" - # Strings in this namespace are used in basic HTML interface. + # Translations in this namespace are used in basic HTML interface. basic: loading_text: Loading... load_error_message: Something went wrong while trying to load the full version of this site. @@ -355,11 +355,53 @@ core: next_page_button: Next Page previous_page_button: Previous Page + # Translations in this namespace are used in emails sent by the forum. + email: + + # These translations are used in emails sent when users register new accounts. + activate_account: + subject: Activate Your New Account + body: | + Hey {username}! + + Someone (hopefully you!) has signed up to {forum} with this email address. + + If this was you, simply click the following link and your account will be activated: + {url} + + If you did not sign up, please ignore this email. + + # These translations are used in emails sent when users change their email address. + confirm_email: + subject: Confirm Your New Email Address + body: | + Hey {username}! + + Someone (hopefully you!) has changed their email address on {forum} to this one. + + If this was you, simply click the following link and your email will be confirmed: + {url} + + If this was not you, please ignore this email. + + # These translations are used in emails sent when users ask to reset their passwords. + reset_password: + subject: Reset Your Password + body: | + Hey {username}! + + Someone (hopefully you!) has submitted a forgotten password request for your account on {forum}. + + If this was you, click the following link to reset your password: + {url} + + If you do not wish to change your password, just ignore this email and nothing will happen. + ## - # REUSED STRINGS - These keys should not be used directly in code! + # REUSED TRANSLATIONS - These keys should not be used directly in code! ## - # Strings in this namespace are referenced by two or more unique keys. + # Translations in this namespace are referenced by two or more unique keys. ref: all_discussions: All Discussions change_email: Change Email @@ -382,63 +424,17 @@ core: save_changes: Save Changes # Referenced by flarum-tags.yml settings: Settings sign_up: Sign Up - start_a_discussion: Start a Discussion some_others: "{count} other|{count} others" # Referenced by flarum-likes.yml, flarum-mentions.yml + start_a_discussion: Start a Discussion username: Username write_a_reply: Write a Reply... you: You # Referenced by flarum-likes.yml, flarum-mentions.yml ## - # EMAIL CONTENT + # GROUP NAMES - These keys are translated at the back end. ## - # Strings in this namespace are used in emails sent by the forum. - email: - - # These strings are used in emails sent when users register new accounts. - activate_account: - subject: Activate Your New Account - body: | - Hey {username}! - - Someone (hopefully you!) has signed up to {forum} with this email address. - - If this was you, simply click the following link and your account will be activated: - {url} - - If you did not sign up, please ignore this email. - - # These strings are used in emails sent when users change their email address. - confirm_email: - subject: Confirm Your New Email Address - body: | - Hey {username}! - - Someone (hopefully you!) has changed their email address on {forum} to this one. - - If this was you, simply click the following link and your email will be confirmed: - {url} - - If this was not you, please ignore this email. - - # These strings are used in emails sent when users ask to reset their passwords. - reset_password: - subject: Reset Your Password - body: | - Hey {username}! - - Someone (hopefully you!) has submitted a forgotten password request for your account on {forum}. - - If this was you, click the following link to reset your password: - {url} - - If you do not wish to change your password, just ignore this email and nothing will happen. - - ## - # GROUP NAMES - ## - - # Strings in this namespace are used to translate default group names. + # Translations in this namespace are used to translate default group names. group: admin: Admin admins: Admins diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml index 936a94f9b..ab9adac8b 100644 --- a/extensions/lang-english/locale/flarum-flags.yml +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -4,23 +4,23 @@ flarum-flags: # UNIQUE KEYS - The following keys are used in only one location each. ## - # Strings in this namespace are used by the admin interface. + # Translations in this namespace are used by the admin interface. admin: - # These strings are used in the Permissions page of the admin interface. + # These translations are used in the Permissions page of the admin interface. permissions: flag_posts_label: Flag posts view_flags_label: View flagged posts - # These strings are used in the Flags Settings modal dialog. + # These translations are used in the Flags Settings modal dialog. settings: guidelines_url_label: Community Guidelines URL title: Flags Settings - # Strings in this namespace are used by the forum user interface. + # Translations in this namespace are used by the forum user interface. forum: - # These strings are used by the Flag Post modal dialog. + # These translations are used by the Flag Post modal dialog. flag_post: confirmation_message: Thank you for flagging this post. Our moderators will look into it. dismiss_button: => core.ref.okay @@ -34,27 +34,27 @@ flarum-flags: submit_button: => flarum-flags.ref.flag_post title: => flarum-flags.ref.flag_post - # These strings are used by the Flagged Posts dropdown, a.k.a. "the flag". + # These translations are used by the Flagged Posts dropdown, a.k.a. "the flag". flagged_posts: empty_text: No Flags title: => flarum-flags.ref.flagged_posts tooltip: => flarum-flags.ref.flagged_posts - # These strings are used by the frame displayed around flagged posts. + # These translations are used by the frame displayed around flagged posts. post: dismiss_flag_tooltip: Dismiss Flag flagged_by_text: "{username} flagged" flagged_by_with_reason_text: "{username} flagged as {reason}" - # These strings are used by the post control buttons. + # These translations are used by the post control buttons. post_controls: flag_button: Flag ## - # REUSED STRINGS - These keys should not be used directly in code! + # REUSED TRANSLATIONS - These keys should not be used directly in code! ## - # Strings in this namespace are referenced by two or more unique keys. + # Translations in this namespace are referenced by two or more unique keys. ref: flag_post: Flag Post flagged_posts: Flagged Posts diff --git a/extensions/lang-english/locale/flarum-likes.yml b/extensions/lang-english/locale/flarum-likes.yml index ac91e2715..683b7b100 100644 --- a/extensions/lang-english/locale/flarum-likes.yml +++ b/extensions/lang-english/locale/flarum-likes.yml @@ -4,22 +4,22 @@ flarum-likes: # UNIQUE KEYS - The following keys are used in only one location each. ## - # Strings in this namespace are used by the admin interface. + # Translations in this namespace are used by the admin interface. admin: - # These strings are used in the Permissions page of the admin interface. + # These translations are used in the Permissions page of the admin interface. permissions: like_posts_label: Like posts - # Strings in this namespace are used by the forum user interface. + # Translations in this namespace are used by the forum user interface. forum: - # These strings are used by the Notifications dropdown, a.k.a. "the bell". + # These translations are used by the Notifications dropdown, a.k.a. "the bell". notifications: post_liked_text: "{username} liked your post" # Can be pluralized to agree with the number of users! others_text: => core.ref.some_others - # These strings are displayed beneath individual posts. + # These translations are displayed beneath individual posts. post: like_link: Like liked_by_text: "{users} likes this.|{users} like this." @@ -28,10 +28,10 @@ flarum-likes: unlike_link: Unlike you_text: => core.ref.you - # These strings are used by the Users Who Like This modal dialog. + # These translations are used by the Users Who Like This modal dialog. post_likes: title: Users Who Like This - # These strings are used in the Settings page. + # These translations are used in the Settings page. settings: notify_post_liked_label: Someone likes one of my posts diff --git a/extensions/lang-english/locale/flarum-lock.yml b/extensions/lang-english/locale/flarum-lock.yml index e752b38b5..2f80ec264 100644 --- a/extensions/lang-english/locale/flarum-lock.yml +++ b/extensions/lang-english/locale/flarum-lock.yml @@ -4,34 +4,34 @@ flarum-lock: # UNIQUE KEYS - The following keys are used in only one location each. ## - # Strings in this namespace are used by the admin interface. + # Translations in this namespace are used by the admin interface. admin: - # These strings are used in the Permissions page of the admin interface. + # These translations are used in the Permissions page of the admin interface. permissions: lock_discussions_label: Lock discussions - # Strings in this namespace are used by the forum user interface. + # Translations in this namespace are used by the forum user interface. forum: - # These strings are displayed as tooltips for discussion badges. + # These translations are displayed as tooltips for discussion badges. badge: locked_tooltip: Locked - # These strings are used by the discussion control buttons. + # These translations are used by the discussion control buttons. discussion_controls: lock_button: Lock unlock_button: Unlock - # These strings are used by the Notifications dropdown, a.k.a. "the bell". + # These translations are used by the Notifications dropdown, a.k.a. "the bell". notifications: discussion_locked_text: "{username} locked" - # These strings are displayed between posts in the post stream. + # These translations are displayed between posts in the post stream. post_stream: discussion_locked_text: "{username} locked the discussion." discussion_unlocked_text: "{username} unlocked the discussion." - # These strings are used in the Settings page. + # These translations are used in the Settings page. settings: notify_discussion_locked_label: Someone locks a discussion I started diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml index c9b2b1d0b..8b8e8892e 100644 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -4,20 +4,20 @@ flarum-mentions: # UNIQUE KEYS - The following keys are used in only one location each. ## - # Strings in this namespace are used by the forum user interface. + # Translations in this namespace are used by the forum user interface. forum: - # These strings are used by the composer (reply autocompletion function). + # These translations are used by the composer (reply autocompletion function). composer: reply_to_post_text: "Reply to #{number}" - # These strings are used by the Notifications dropdown, a.k.a. "the bell". + # These translations are used by the Notifications dropdown, a.k.a. "the bell". notifications: post_mentioned_text: "{username} replied to your post" # Can be pluralized to agree with the number of users! others_text: => core.ref.some_others user_mentioned_text: "{username} mentioned you" - # These strings are displayed beneath individual posts. + # These translations are displayed beneath individual posts. post: mentioned_by_text: "{users} replied to this." # Can be pluralized to agree with the number of users! mentioned_by_self_text: "{users} replied to this." # Can be pluralized to agree with the number of users! @@ -25,7 +25,7 @@ flarum-mentions: reply_link: => core.ref.reply you_text: => core.ref.you - # These strings are used in the Settings page. + # These translations are used in the Settings page. settings: notify_post_mentioned_label: Someone replies to one of my posts notify_user_mentioned_label: Someone mentions me in a post diff --git a/extensions/lang-english/locale/flarum-pusher.yml b/extensions/lang-english/locale/flarum-pusher.yml index 1ef5f623a..ae2686411 100644 --- a/extensions/lang-english/locale/flarum-pusher.yml +++ b/extensions/lang-english/locale/flarum-pusher.yml @@ -4,19 +4,19 @@ flarum-pusher: # UNIQUE KEYS - The following keys are used in only one location each. ## - # Strings in this namespace are used by the admin interface. + # Translations in this namespace are used by the admin interface. admin: - # These strings are used in the Pusher Settings modal dialog. + # These translations are used in the Pusher Settings modal dialog. pusher_settings: app_id_label: App ID app_key_label: App Key app_secret_label: App Secret title: Pusher Settings - # Strings in this namespace are used by the admin interface. + # Translations in this namespace are used by the admin interface. forum: - # These strings are used in the discussion list. + # These translations are used in the discussion list. discussion_list: show_updates_text: "Show {count} updated discussion|Show {count} updated discussions" diff --git a/extensions/lang-english/locale/flarum-sticky.yml b/extensions/lang-english/locale/flarum-sticky.yml index cb004cfab..850bc88bf 100644 --- a/extensions/lang-english/locale/flarum-sticky.yml +++ b/extensions/lang-english/locale/flarum-sticky.yml @@ -4,34 +4,34 @@ flarum-sticky: # UNIQUE KEYS - The following keys are used in only one location each. ## - # Strings in this namespace are used by the admin interface. + # Translations in this namespace are used by the admin interface. admin: - # These strings are used in the Permissions page of the admin interface. + # These translations are used in the Permissions page of the admin interface. permissions: sticky_discussions_label: Sticky discussions - # Strings in this namespace are used by the forum user interface. + # Translations in this namespace are used by the forum user interface. forum: - # These strings are displayed as tooltips for discussion badges. + # These translations are displayed as tooltips for discussion badges. badge: sticky_tooltip: => flarum-sticky.ref.sticky - # These strings are used by the discussion control buttons. + # These translations are used by the discussion control buttons. discussion_controls: sticky_button: => flarum-sticky.ref.sticky unsticky_button: Unsticky - # These strings are displayed between posts in the post stream. + # These translations are displayed between posts in the post stream. post_stream: discussion_stickied_text: "{username} stickied the discussion." discussion_unstickied_text: "{username} unstickied the discussion." ## - # REUSED STRINGS - These keys should not be used directly in code! + # REUSED TRANSLATIONS - These keys should not be used directly in code! ## - # Strings in this namespace are referenced by two or more unique keys. + # Translations in this namespace are referenced by two or more unique keys. ref: sticky: Sticky diff --git a/extensions/lang-english/locale/flarum-subscriptions.yml b/extensions/lang-english/locale/flarum-subscriptions.yml index f82d0a6ed..9a4bdf401 100644 --- a/extensions/lang-english/locale/flarum-subscriptions.yml +++ b/extensions/lang-english/locale/flarum-subscriptions.yml @@ -4,33 +4,33 @@ flarum-subscriptions: # UNIQUE KEYS - The following keys are used in only one location each. ## - # Strings in this namespace are used by the forum user interface. + # Translations in this namespace are used by the forum user interface. forum: - # These strings are displayed as tooltips for discussion badges. + # These translations are displayed as tooltips for discussion badges. badge: following_tooltip: => flarum-subscriptions.ref.following ignoring_tooltip: => flarum-subscriptions.ref.ignoring - # These strings are used by the discussion control buttons. + # These translations are used by the discussion control buttons. discussion_controls: follow_button: => flarum-subscriptions.ref.follow unfollow_button: Unfollow unignore_button: Unignore - # These strings are used on the index page, peripheral to the discussion list. + # These translations are used on the index page, peripheral to the discussion list. index: following_link: => flarum-subscriptions.ref.following - # These strings are used by the Notifications dropdown, a.k.a. "the bell". + # These translations are used by the Notifications dropdown, a.k.a. "the bell". notifications: new_post_text: "{username} posted" - # These strings are used in the Settings page. + # These translations are used in the Settings page. settings: notify_new_post_label: Someone posts in a discussion I'm following - # These strings are used in the subscription menu displayed to the right of the post stream. + # These translations are used in the subscription menu displayed to the right of the post stream. sub_controls: follow_button: => flarum-subscriptions.ref.follow following_button: => flarum-subscriptions.ref.following @@ -43,10 +43,10 @@ flarum-subscriptions: notify_alert_tooltip: Get a forum notification when there are new posts ## - # REUSED STRINGS - These keys should not be used directly in code! + # REUSED TRANSLATIONS - These keys should not be used directly in code! ## - # Strings in this namespace are referenced by two or more unique keys. + # Translations in this namespace are referenced by two or more unique keys. ref: follow: Follow following: Following diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index 2b0954aa2..65a8267eb 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -4,14 +4,14 @@ flarum-tags: # UNIQUE KEYS - The following keys are used in only one location each. ## - # Strings in this namespace are used by the admin interface. + # Translations in this namespace are used by the admin interface. admin: - # These strings are used in the Basics page. + # These translations are used in the Basics page. basics: tags_label: => flarum-tags.ref.tags - # These strings are used in the Edit Tag modal dialog. + # These translations are used in the Edit Tag modal dialog. edit_tag: color_label: Color description_label: Description @@ -24,17 +24,17 @@ flarum-tags: submit_button: => core.ref.save_changes title: => flarum-tags.ref.create_tag - # These strings are used in the navigation bar. + # These translations are used in the navigation bar. nav: tags_button: => flarum-tags.ref.tags tags_text: Manage the list of tags available to organise discussions with. - # These strings are used in the Permissions page of the admin interface. + # These translations are used in the Permissions page of the admin interface. permissions: restrict_by_tag_heading: Restrict by Tag tag_discussions_label: Tag discussions - # These strings are used in the Tag Settings modal dialog. + # These translations are used in the Tag Settings modal dialog. tag_settings: range_separator_text: " to " required_primary_heading: Required Number of Primary Tags @@ -43,7 +43,7 @@ flarum-tags: required_secondary_text: Enter the minimum and maximum number of secondary tags that may be applied to a discussion. title: Tag Settings - # These strings are used in the Tags page. + # These translations are used in the Tags page. tags: about_tags_text: "Tags are used to categorize discussions. Primary tags are like traditional forum categories: they can be arranged in a two-level hierarchy. Secondary tags do not have hierarchy or order, and are useful for micro-categorization." create_tag_button: => flarum-tags.ref.create_tag @@ -51,10 +51,10 @@ flarum-tags: secondary_heading: Secondary Tags settings_button: Settings - # Strings in this namespace are used by the forum user interface. + # Translations in this namespace are used by the forum user interface. forum: - # These strings are used by the Choose Tags modal dialog. + # These translations are used by the Choose Tags modal dialog. choose_tags: choose_primary_placeholder: "Choose a primary tag|Choose {count} primary tags" choose_secondary_placeholder: "Choose 1 more tag|Choose {count} more tags" @@ -62,38 +62,38 @@ flarum-tags: submit_button: => core.ref.okay title: Choose Tags for Your Discussion - # These strings are used by the composer when starting a discussion. + # These translations are used by the composer when starting a discussion. composer_discussion: choose_tags_link: Choose Tags - # These strings are used by the discussion control buttons. + # These translations are used by the discussion control buttons. discussion_controls: edit_tags_button: Edit Tags - # These strings are used on the index page, peripheral to the discussion list. + # These translations are used on the index page, peripheral to the discussion list. index: tags_link: => flarum-tags.ref.tags more_link: More... untagged_link: Untagged - # These strings are displayed between posts in the post stream. + # These translations are displayed between posts in the post stream. post_stream: added_tags_text: "{username} added the {tagsAdded}." added_and_removed_tags_text: "{username} added the {tagsAdded} and removed the {tagsRemoved}." removed_tags_text: "{username} removed the {tagsRemoved}." tags_text: "{tags} tag|{tags} tags" - # Strings in this namespace are used by the forum and admin interfaces. + # Translations in this namespace are used by the forum and admin interfaces. lib: # This string is displayed in place of the name of a tag that's been deleted. deleted_tag_text: Deleted ## - # REUSED STRINGS - These keys should not be used directly in code! + # REUSED TRANSLATIONS - These keys should not be used directly in code! ## - # Strings in this namespace are referenced by two or more unique keys. + # Translations in this namespace are referenced by two or more unique keys. ref: create_tag: Create Tag name: Name From 29dc0d50217b1a0703303e22924086500bb78247 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sat, 28 Nov 2015 17:19:53 +0900 Subject: [PATCH 075/272] Extract leftover strings - Adds resources in support of flarum/core #645. - Also fixes a few comments in the core and Tags resources. --- extensions/lang-english/locale/core.yml | 18 +++++++++++++++--- extensions/lang-english/locale/flarum-tags.yml | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index fed88e38e..174b0f0e5 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -42,6 +42,13 @@ core: support_text: "Found a bug? Please report it in our forum, under the Support tag." troubleshooting_text: "Having problems? Follow the instructions in the Troubleshooting docs." version_text: "Thanks for trying out Flarum! You are running version {version}." + welcome_text: "Welcome to Flarum Beta!" + + # These translations are used in the Edit Custom CSS modal dialog. + edit_css: + customize_text: Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles. + submit_button: => core.ref.save_changes + title: # These translations are used in the Edit Group modal dialog. edit_group: @@ -64,11 +71,11 @@ core: settings_button: => core.ref.settings uninstall_button: Uninstall - # This string is used in the session dropdown menu. + # These translations are used in the session dropdown menu. header: log_out_button: => core.ref.log_out - # This string is used in the modal dialog displayed when loading extensions. + # These translations are used in the modal dialog displayed when loading extensions. loading: title: Please Wait... @@ -116,6 +123,10 @@ core: signup_closed_button: Closed signup_open_button: Open + # These translations are used in the Settings modal dialog. + settings: + submit_button: => core.ref.save_changes + # Translations in this namespace are used by the forum user interface. forum: @@ -306,6 +317,7 @@ core: avatar_upload_button: Upload bio_placeholder: Write something about yourself discussions_link: => core.ref.discussions + in_discussion_text: "In {discussion}" joined_date_text: "Joined {ago}" online_text: Online posts_load_more_button: => core.ref.load_more @@ -326,7 +338,7 @@ core: badge: hidden_tooltip: Hidden - # This string is displayed in place of the username of deleted user account. + # This translation is displayed in place of the username of a deleted user account. deleted_user_text: "[deleted]" # These translations are displayed as error messages. diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index 65a8267eb..a5d50e3b9 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -86,7 +86,7 @@ flarum-tags: # Translations in this namespace are used by the forum and admin interfaces. lib: - # This string is displayed in place of the name of a tag that's been deleted. + # This translation is displayed in place of the name of a tag that's been deleted. deleted_tag_text: Deleted ## From 3df88d6e3311b2c1f61ddd3fc6cd58ce2407de78 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sat, 28 Nov 2015 17:38:21 +0900 Subject: [PATCH 076/272] Adds required double quotes to a translation. --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 174b0f0e5..d7fc4e588 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -46,7 +46,7 @@ core: # These translations are used in the Edit Custom CSS modal dialog. edit_css: - customize_text: Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles. + customize_text: "Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles." submit_button: => core.ref.save_changes title: From a4a538aa8a1aa7b34bed02ff706df39c17ccd474 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sat, 28 Nov 2015 17:44:52 +0900 Subject: [PATCH 077/272] Adds a missing translation text. --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index d7fc4e588..f27998d3a 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -48,7 +48,7 @@ core: edit_css: customize_text: "Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles." submit_button: => core.ref.save_changes - title: + title: Edit Custom CSS # These translations are used in the Edit Group modal dialog. edit_group: From a626f6dbb5bce0a29ff17d598b13c8f0cd6c60d3 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sun, 29 Nov 2015 12:15:44 +0900 Subject: [PATCH 078/272] Add translations for Approval and Suspend - Adds resources to support flarum/approval#1. - Adds resources to support flarum/suspend#2. - Updates a comment in core language resources. --- extensions/lang-english/locale/core.yml | 2 +- .../lang-english/locale/flarum-approval.yml | 24 ++++++++++++++ .../lang-english/locale/flarum-suspend.yml | 33 +++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 extensions/lang-english/locale/flarum-approval.yml create mode 100644 extensions/lang-english/locale/flarum-suspend.yml diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index f27998d3a..8c594f364 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -433,7 +433,7 @@ core: password: Password reply: Reply # Referenced by flarum-mentions.yml restore: Restore - save_changes: Save Changes # Referenced by flarum-tags.yml + save_changes: Save Changes # Referenced by flarum-suspend.yml, flarum-tags.yml settings: Settings sign_up: Sign Up some_others: "{count} other|{count} others" # Referenced by flarum-likes.yml, flarum-mentions.yml diff --git a/extensions/lang-english/locale/flarum-approval.yml b/extensions/lang-english/locale/flarum-approval.yml new file mode 100644 index 000000000..b372f5e0f --- /dev/null +++ b/extensions/lang-english/locale/flarum-approval.yml @@ -0,0 +1,24 @@ +flarum-approval: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Translations in this namespace are used by the admin interface. + admin: + + # These translations are used in the Permissions page of the admin interface. + permissions: + approve_posts_label: Approve posts + reply_without_approval_label: Reply without approval + + # Translations in this namespace are used by the forum user interface. + forum: + + # These translations are displayed in the post header. + post: + awaiting_approval_text: Awaiting approval + + # These translations are used by the post control buttons. + post_controls: + approve_button: Approve diff --git a/extensions/lang-english/locale/flarum-suspend.yml b/extensions/lang-english/locale/flarum-suspend.yml new file mode 100644 index 000000000..46e82e509 --- /dev/null +++ b/extensions/lang-english/locale/flarum-suspend.yml @@ -0,0 +1,33 @@ +flarum-suspend: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Translations in this namespace are used by the admin interface. + admin: + + # These translations are used in the Permissions page of the admin interface. + permissions: + suspend_users_label: Suspend users + + # Translations in this namespace are used by the forum user interface. + forum: + + # These translations are used in the Suspend User modal dialog (admin function). + suspend_user: + submit_button: => core.ref.save_changes + indefinitely_label: Suspended indefinitely + limited_time_label: Suspended for a limited time... + limited_time_days_text: " days" + not_suspended_label: Not suspended + status_heading: Suspension Status + title: "Suspend {user}" + + # These translations are displayed as tooltips for user badges. + user_badge: + suspended_tooltip: Locked + + # These translations are found on the user profile page (admin function). + user_controls: + suspend_button: Suspend From fd13c4609eb7b0b5c88ac3a3c0fc95d5d59bc629 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sun, 29 Nov 2015 13:14:40 +0900 Subject: [PATCH 079/272] Add translations for Flarum Auth extensions - Adds resources to support flarum/auth-facebook#1. - Adds resources to support flarum/auth-github#1. - Adds resources to support flarum/auth-twitter#1. --- .../locale/flarum-auth-facebook.yml | 21 +++++++++++++++++++ .../locale/flarum-auth-github.yml | 21 +++++++++++++++++++ .../locale/flarum-auth-twitter.yml | 21 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 extensions/lang-english/locale/flarum-auth-facebook.yml create mode 100644 extensions/lang-english/locale/flarum-auth-github.yml create mode 100644 extensions/lang-english/locale/flarum-auth-twitter.yml diff --git a/extensions/lang-english/locale/flarum-auth-facebook.yml b/extensions/lang-english/locale/flarum-auth-facebook.yml new file mode 100644 index 000000000..89f7ef772 --- /dev/null +++ b/extensions/lang-english/locale/flarum-auth-facebook.yml @@ -0,0 +1,21 @@ +flarum-auth-facebook: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Translations in this namespace are used by the admin interface. + admin: + + # These translations are used in the Facebook Settings modal dialog. + facebook_settings: + app_id_label: App ID + app_secret_label: App Secret + title: Facebook Settings + + # Translations in this namespace are used by the forum user interface. + forum: + + # These translations are used in the Log In modal dialog. + log_in: + with_facebook_button: Log In with Facebook diff --git a/extensions/lang-english/locale/flarum-auth-github.yml b/extensions/lang-english/locale/flarum-auth-github.yml new file mode 100644 index 000000000..593379f61 --- /dev/null +++ b/extensions/lang-english/locale/flarum-auth-github.yml @@ -0,0 +1,21 @@ +flarum-auth-github: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Translations in this namespace are used by the admin interface. + admin: + + # These translations are used in the GitHub Settings modal dialog. + github_settings: + client_id_label: Client ID + client_secret_label: Client Secret + title: GitHub Settings + + # Translations in this namespace are used by the forum user interface. + forum: + + # These translations are used in the Log In modal dialog. + log_in: + with_github_button: Log In with GitHub diff --git a/extensions/lang-english/locale/flarum-auth-twitter.yml b/extensions/lang-english/locale/flarum-auth-twitter.yml new file mode 100644 index 000000000..a5894d043 --- /dev/null +++ b/extensions/lang-english/locale/flarum-auth-twitter.yml @@ -0,0 +1,21 @@ +flarum-auth-twitter: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Translations in this namespace are used by the admin interface. + admin: + + # These translations are used in the Twitter Settings modal dialog. + twitter_settings: + api_key_label: API Key + api_secret_label: API Secret + title: Twitter Settings + + # Translations in this namespace are used by the forum user interface. + forum: + + # These translations are used in the Log In modal dialog. + log_in: + with_twitter_button: Log In with Twitter From 5099791b55d08aacee86417513418e742315a7b2 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sun, 29 Nov 2015 15:02:59 +0900 Subject: [PATCH 080/272] Add translations for Akismet - Adds resources to support flarum/akismet#1. --- .../lang-english/locale/flarum-akismet.yml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 extensions/lang-english/locale/flarum-akismet.yml diff --git a/extensions/lang-english/locale/flarum-akismet.yml b/extensions/lang-english/locale/flarum-akismet.yml new file mode 100644 index 000000000..861348177 --- /dev/null +++ b/extensions/lang-english/locale/flarum-akismet.yml @@ -0,0 +1,22 @@ +flarum-akismet: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Translations in this namespace are used by the admin interface. + admin: + + # These translations are used in the Akismet Settings modal dialog. + akismet_settings: + api_key_label: API Key + title: Akismet Settings + + # Translations in this namespace are used by the forum user interface. + forum: + + # These translations are used by the frame displayed around flagged posts. + post: + akismet_flagged_text: Akismet flagged as spam + not_spam_button: Not Spam + From ebb08d8596fcab2a4afb774e216e8a77e25884cb Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sun, 29 Nov 2015 16:51:29 +0900 Subject: [PATCH 081/272] Fix translations - Fixes a copypasta translation in Suspend. - Thanks to @maelsoucaze for proofreading, as always! --- extensions/lang-english/locale/flarum-suspend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-suspend.yml b/extensions/lang-english/locale/flarum-suspend.yml index 46e82e509..ceb6e309e 100644 --- a/extensions/lang-english/locale/flarum-suspend.yml +++ b/extensions/lang-english/locale/flarum-suspend.yml @@ -26,7 +26,7 @@ flarum-suspend: # These translations are displayed as tooltips for user badges. user_badge: - suspended_tooltip: Locked + suspended_tooltip: Suspended # These translations are found on the user profile page (admin function). user_controls: From 784ac722b731a935005ea7b6c086735bb7102f46 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Mon, 30 Nov 2015 11:23:18 +0900 Subject: [PATCH 082/272] Clean up locale files - Adjusts namespacing in support of flarum/core#648. - Corrects key alphabetization in a few locale files. --- extensions/lang-english/locale/core.yml | 19 ++++++++++--------- .../lang-english/locale/flarum-likes.yml | 4 ++-- .../lang-english/locale/flarum-mentions.yml | 4 ++-- .../lang-english/locale/flarum-suspend.yml | 2 +- .../lang-english/locale/flarum-tags.yml | 6 +++--- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 8c594f364..a54f22f39 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -338,14 +338,15 @@ core: badge: hidden_tooltip: Hidden - # This translation is displayed in place of the username of a deleted user account. - deleted_user_text: "[deleted]" + # These translations are used to modify usernames. + username: + deleted_text: "[deleted]" # These translations are displayed as error messages. error: generic_message: "Oops! Something went wrong. Please reload the page and try again." - permission_denied_message: You do not have permission to do that. not_found_message: The requested resource was not found. + permission_denied_message: You do not have permission to do that. rate_limit_exceeded_message: You're going a little too quickly. Please try again in a few seconds. # These translations are used as suffixes when abbreviating numbers. @@ -356,14 +357,14 @@ core: # These translations are used to punctuate a series of items. series: glue_text: ", " - two_text: "{first} and {second}" three_text: "{first}, {second}, and {third}" + two_text: "{first} and {second}" # Translations in this namespace are used in basic HTML interface. basic: - loading_text: Loading... - load_error_message: Something went wrong while trying to load the full version of this site. javascript_disabled_message: This site is best viewed in a modern browser with JavaScript enabled. + load_error_message: Something went wrong while trying to load the full version of this site. + loading_text: Loading... next_page_button: Next Page previous_page_button: Previous Page @@ -372,7 +373,6 @@ core: # These translations are used in emails sent when users register new accounts. activate_account: - subject: Activate Your New Account body: | Hey {username}! @@ -382,10 +382,10 @@ core: {url} If you did not sign up, please ignore this email. + subject: Activate Your New Account # These translations are used in emails sent when users change their email address. confirm_email: - subject: Confirm Your New Email Address body: | Hey {username}! @@ -395,10 +395,10 @@ core: {url} If this was not you, please ignore this email. + subject: Confirm Your New Email Address # These translations are used in emails sent when users ask to reset their passwords. reset_password: - subject: Reset Your Password body: | Hey {username}! @@ -408,6 +408,7 @@ core: {url} If you do not wish to change your password, just ignore this email and nothing will happen. + subject: Reset Your Password ## # REUSED TRANSLATIONS - These keys should not be used directly in code! diff --git a/extensions/lang-english/locale/flarum-likes.yml b/extensions/lang-english/locale/flarum-likes.yml index 683b7b100..b723b35ee 100644 --- a/extensions/lang-english/locale/flarum-likes.yml +++ b/extensions/lang-english/locale/flarum-likes.yml @@ -16,14 +16,14 @@ flarum-likes: # These translations are used by the Notifications dropdown, a.k.a. "the bell". notifications: - post_liked_text: "{username} liked your post" # Can be pluralized to agree with the number of users! others_text: => core.ref.some_others + post_liked_text: "{username} liked your post" # Can be pluralized to agree with the number of users! # These translations are displayed beneath individual posts. post: like_link: Like - liked_by_text: "{users} likes this.|{users} like this." liked_by_self_text: "{users} like this." # Can be pluralized to agree with the number of users! + liked_by_text: "{users} likes this.|{users} like this." others_link: => core.ref.some_others unlike_link: Unlike you_text: => core.ref.you diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml index 8b8e8892e..2a2b88d69 100644 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -13,14 +13,14 @@ flarum-mentions: # These translations are used by the Notifications dropdown, a.k.a. "the bell". notifications: - post_mentioned_text: "{username} replied to your post" # Can be pluralized to agree with the number of users! others_text: => core.ref.some_others + post_mentioned_text: "{username} replied to your post" # Can be pluralized to agree with the number of users! user_mentioned_text: "{username} mentioned you" # These translations are displayed beneath individual posts. post: - mentioned_by_text: "{users} replied to this." # Can be pluralized to agree with the number of users! mentioned_by_self_text: "{users} replied to this." # Can be pluralized to agree with the number of users! + mentioned_by_text: "{users} replied to this." # Can be pluralized to agree with the number of users! others_text: => core.ref.some_others reply_link: => core.ref.reply you_text: => core.ref.you diff --git a/extensions/lang-english/locale/flarum-suspend.yml b/extensions/lang-english/locale/flarum-suspend.yml index ceb6e309e..e592055a2 100644 --- a/extensions/lang-english/locale/flarum-suspend.yml +++ b/extensions/lang-english/locale/flarum-suspend.yml @@ -16,12 +16,12 @@ flarum-suspend: # These translations are used in the Suspend User modal dialog (admin function). suspend_user: - submit_button: => core.ref.save_changes indefinitely_label: Suspended indefinitely limited_time_label: Suspended for a limited time... limited_time_days_text: " days" not_suspended_label: Not suspended status_heading: Suspension Status + submit_button: => core.ref.save_changes title: "Suspend {user}" # These translations are displayed as tooltips for user badges. diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index e72b7c220..d21809ca7 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -14,9 +14,9 @@ flarum-tags: # These translations are used in the Edit Tag modal dialog. edit_tag: color_label: Color - description_label: Description delete_tag_button: Delete Tag delete_tag_confirmation: "Are you sure you want to delete this tag? The tag's discussions will NOT be deleted." + description_label: Description hide_label: Hide from All Discussions name_label: => flarum-tags.ref.name name_placeholder: => flarum-tags.ref.name @@ -31,9 +31,9 @@ flarum-tags: # These translations are used in the Permissions page of the admin interface. permissions: + allow_edit_tags_label: Allow tag editing restrict_by_tag_heading: Restrict by Tag tag_discussions_label: Tag discussions - allow_edit_tags_label: Allow tag editing # These translations are used in the Tag Settings modal dialog. tag_settings: @@ -73,8 +73,8 @@ flarum-tags: # These translations are used on the index page, peripheral to the discussion list. index: - tags_link: => flarum-tags.ref.tags more_link: More... + tags_link: => flarum-tags.ref.tags untagged_link: Untagged # These translations are displayed between posts in the post stream. From 8a698d14a6f43fdc4f5787d268b22e2d9afd4697 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 3 Dec 2015 21:08:09 +1030 Subject: [PATCH 083/272] Add ConfirmPasswordModal translations --- extensions/lang-english/locale/core.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index a54f22f39..809e4ae15 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -172,6 +172,12 @@ core: submit_button: Post Reply view_button: View + # These translations are used in the Confirm Password modal dialog. + confirm_password: + password_placeholder: => core.ref.password + submit_button: => core.ref.confirm_password + title: => core.ref.confirm_password + # These translations are used by the discussion control buttons. discussion_controls: cannot_reply_button: Can't Reply @@ -419,6 +425,7 @@ core: all_discussions: All Discussions change_email: Change Email change_password: Change Password + confirm_password: Confirm Password confirmation_email_sent: "We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." delete: Delete delete_forever: Delete Forever From 46f3f95842e8b5e2bfc92d9e3ed88372046e6ec2 Mon Sep 17 00:00:00 2001 From: Peter Mein Date: Thu, 17 Dec 2015 10:51:44 +0100 Subject: [PATCH 084/272] Added forum heading and followAfterReply --- extensions/lang-english/locale/core.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 809e4ae15..c380d747a 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -297,6 +297,8 @@ core: account_heading: Account change_email_button: => core.ref.change_email change_password_button: => core.ref.change_password + forum_heading: Forum + forum_follow_after_reply_label: Automaticaly follow a discussion after you posted in the discussion notifications_heading: => core.ref.notifications notify_by_email_heading: => core.ref.email notify_by_web_heading: Web From e8e3a45ed2ff81d9dc11fdb55af49e89d48f27e6 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 21 Dec 2015 08:55:44 +1030 Subject: [PATCH 085/272] Fix translation variable --- extensions/lang-english/locale/flarum-suspend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-suspend.yml b/extensions/lang-english/locale/flarum-suspend.yml index e592055a2..f2ebed91f 100644 --- a/extensions/lang-english/locale/flarum-suspend.yml +++ b/extensions/lang-english/locale/flarum-suspend.yml @@ -22,7 +22,7 @@ flarum-suspend: not_suspended_label: Not suspended status_heading: Suspension Status submit_button: => core.ref.save_changes - title: "Suspend {user}" + title: "Suspend {username}" # These translations are displayed as tooltips for user badges. user_badge: From 3ced3d377faa5f0e122699c941f83a4741341f66 Mon Sep 17 00:00:00 2001 From: Peter Mein Date: Sat, 26 Dec 2015 22:09:27 +0100 Subject: [PATCH 086/272] Moved english to package yml --- extensions/lang-english/locale/core.yml | 2 -- extensions/lang-english/locale/flarum-subscriptions.yml | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index c380d747a..809e4ae15 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -297,8 +297,6 @@ core: account_heading: Account change_email_button: => core.ref.change_email change_password_button: => core.ref.change_password - forum_heading: Forum - forum_follow_after_reply_label: Automaticaly follow a discussion after you posted in the discussion notifications_heading: => core.ref.notifications notify_by_email_heading: => core.ref.email notify_by_web_heading: Web diff --git a/extensions/lang-english/locale/flarum-subscriptions.yml b/extensions/lang-english/locale/flarum-subscriptions.yml index 9a4bdf401..74ce23731 100644 --- a/extensions/lang-english/locale/flarum-subscriptions.yml +++ b/extensions/lang-english/locale/flarum-subscriptions.yml @@ -29,6 +29,8 @@ flarum-subscriptions: # These translations are used in the Settings page. settings: notify_new_post_label: Someone posts in a discussion I'm following + forum_heading: Forum + forum_follow_after_reply_label: Automaticaly follow a discussion after you posted in the discussion # These translations are used in the subscription menu displayed to the right of the post stream. sub_controls: From 162d82e2df1dad7c0208709f31cdcd51754e8b65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Sun, 27 Dec 2015 20:16:18 +0100 Subject: [PATCH 087/272] Sort language keys by firstname (alphabetically) --- extensions/lang-english/locale/flarum-subscriptions.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/lang-english/locale/flarum-subscriptions.yml b/extensions/lang-english/locale/flarum-subscriptions.yml index 74ce23731..2a7317657 100644 --- a/extensions/lang-english/locale/flarum-subscriptions.yml +++ b/extensions/lang-english/locale/flarum-subscriptions.yml @@ -28,9 +28,9 @@ flarum-subscriptions: # These translations are used in the Settings page. settings: - notify_new_post_label: Someone posts in a discussion I'm following - forum_heading: Forum forum_follow_after_reply_label: Automaticaly follow a discussion after you posted in the discussion + forum_heading: Forum + notify_new_post_label: Someone posts in a discussion I'm following # These translations are used in the subscription menu displayed to the right of the post stream. sub_controls: @@ -41,8 +41,8 @@ flarum-subscriptions: ignoring_text: Never be notified. Hide from the discussion list. not_following_button: Not Following not_following_text: "Be notified only when @mentioned." - notify_email_tooltip: Get an email when there are new posts notify_alert_tooltip: Get a forum notification when there are new posts + notify_email_tooltip: Get an email when there are new posts ## # REUSED TRANSLATIONS - These keys should not be used directly in code! From 6f9e4f2e16918f4fdeb94c805f04c23d34789289 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 29 Dec 2015 12:55:11 +1030 Subject: [PATCH 088/272] Rename package --- extensions/lang-english/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index d735b6553..e8b1302f3 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -1,5 +1,5 @@ { - "name": "flarum/english", + "name": "flarum/flarum-ext-english", "type": "flarum-extension", "description": "English language pack.", "keywords": ["locale"], From 33b06f376e28264606df71d443401ad2d3965255 Mon Sep 17 00:00:00 2001 From: Bogdan Teodoru Date: Sat, 9 Jan 2016 15:21:45 +0200 Subject: [PATCH 089/272] Added "Are you sure you want to mark all notifications as read?" --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 809e4ae15..032931395 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -259,6 +259,7 @@ core: mark_all_as_read_tooltip: => core.ref.mark_all_as_read title: => core.ref.notifications tooltip: => core.ref.notifications + mark_all_as_read_confirm_text: "Are you sure you want to mark all notifications as read?" # These translations are used by tooltips displayed for individual posts. post: From ace61786ba670827fee61e26cadf78cfe8769576 Mon Sep 17 00:00:00 2001 From: Bogdan Teodoru Date: Sun, 10 Jan 2016 12:16:14 +0200 Subject: [PATCH 090/272] Added "Are you sure you want to mark all notifications as read?" --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 032931395..53f9e8eb5 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -195,6 +195,7 @@ core: discussion_list: empty_text: "It looks like there are no discussions here." load_more_button: => core.ref.load_more + mark_all_as_read_confirmation: "Are you sure you want to mark all notifications as read?" mark_as_read_tooltip: Mark as Read replied_text: "{username} replied {ago}" started_text: "{username} started {ago}" @@ -259,7 +260,6 @@ core: mark_all_as_read_tooltip: => core.ref.mark_all_as_read title: => core.ref.notifications tooltip: => core.ref.notifications - mark_all_as_read_confirm_text: "Are you sure you want to mark all notifications as read?" # These translations are used by tooltips displayed for individual posts. post: From 27e3018b78ea6a6e62c2fc02faf377cc01458ebe Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sun, 10 Jan 2016 20:59:44 +0100 Subject: [PATCH 091/272] Update year range in LICENSE --- extensions/lang-english/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/LICENSE b/extensions/lang-english/LICENSE index 4b92a42c7..eae9c24fb 100644 --- a/extensions/lang-english/LICENSE +++ b/extensions/lang-english/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 Toby Zerner +Copyright (c) 2015-2016 Toby Zerner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 201f43719b21e22898b7fbe339a7cf93294aac8d Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Mon, 11 Jan 2016 08:49:36 +0100 Subject: [PATCH 092/272] Use new language pack helper Refs flarum/core#717. --- extensions/lang-english/bootstrap.php | 33 +-------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/extensions/lang-english/bootstrap.php b/extensions/lang-english/bootstrap.php index 5fdb1a099..23ae20fcf 100644 --- a/extensions/lang-english/bootstrap.php +++ b/extensions/lang-english/bootstrap.php @@ -5,37 +5,6 @@ use Flarum\Event\ConfigureLocales; return function (Dispatcher $events) { $events->listen(ConfigureLocales::class, function(ConfigureLocales $event) { - $name = $title = basename(__DIR__); - - if (file_exists($manifest = __DIR__.'/composer.json')) { - $json = json_decode(file_get_contents($manifest), true); - - if (empty($json)) { - throw new RuntimeException("Error parsing composer.json in $name: ".json_last_error_msg()); - } - - $locale = array_get($json, 'extra.flarum-locale.code'); - $title = array_get($json, 'extra.flarum-locale.title', $title); - } - - if (! isset($locale)) { - throw new RuntimeException("Language pack $name must define \"extra.flarum-locale.code\" in composer.json."); - } - - $event->locales->addLocale($locale, $title); - - if (! is_dir($localeDir = __DIR__.'/locale')) { - throw new RuntimeException("Language pack $name must have a \"locale\" subdirectory."); - } - - if (file_exists($file = $localeDir.'/config.js')) { - $event->locales->addJsFile($locale, $file); - } - - foreach (new DirectoryIterator($localeDir) as $file) { - if ($file->isFile() && in_array($file->getExtension(), ['yml', 'yaml'])) { - $event->locales->addTranslations($locale, $file->getPathname()); - } - } + $event->loadLanguagePackFrom(__DIR__); }); }; From f4a80e599257a77f0a491d7c811c4915739687e8 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Mon, 11 Jan 2016 09:40:57 +0100 Subject: [PATCH 093/272] Coding style fixes --- extensions/lang-english/bootstrap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/bootstrap.php b/extensions/lang-english/bootstrap.php index 23ae20fcf..a941063c8 100644 --- a/extensions/lang-english/bootstrap.php +++ b/extensions/lang-english/bootstrap.php @@ -1,10 +1,10 @@ listen(ConfigureLocales::class, function(ConfigureLocales $event) { + $events->listen(ConfigureLocales::class, function (ConfigureLocales $event) { $event->loadLanguagePackFrom(__DIR__); }); }; From ee85e9bbaf342ca9f6b1e2e0172f07b8553c916a Mon Sep 17 00:00:00 2001 From: Bogdan Teodoru Date: Mon, 11 Jan 2016 23:11:59 +0200 Subject: [PATCH 094/272] #679 Ask for confirmation before "Mark all as Read" --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 53f9e8eb5..f1f94f3b7 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -195,7 +195,6 @@ core: discussion_list: empty_text: "It looks like there are no discussions here." load_more_button: => core.ref.load_more - mark_all_as_read_confirmation: "Are you sure you want to mark all notifications as read?" mark_as_read_tooltip: Mark as Read replied_text: "{username} replied {ago}" started_text: "{username} started {ago}" @@ -231,6 +230,7 @@ core: all_discussions_link: => core.ref.all_discussions cannot_start_discussion_button: Can't Start Discussion mark_all_as_read_tooltip: => core.ref.mark_all_as_read + mark_all_as_read_confirmation: "Are you sure you want to mark all discussions as read?" refresh_tooltip: Refresh start_discussion_button: => core.ref.start_a_discussion From 88aa866fe79d1a49d571e424cc411bbf65e2cc7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Wed, 13 Jan 2016 00:28:08 +0100 Subject: [PATCH 095/272] Sort alphabetically mark_all_as_read_confirmation --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index f1f94f3b7..b77414943 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -229,8 +229,8 @@ core: index: all_discussions_link: => core.ref.all_discussions cannot_start_discussion_button: Can't Start Discussion - mark_all_as_read_tooltip: => core.ref.mark_all_as_read mark_all_as_read_confirmation: "Are you sure you want to mark all discussions as read?" + mark_all_as_read_tooltip: => core.ref.mark_all_as_read refresh_tooltip: Refresh start_discussion_button: => core.ref.start_a_discussion From ec5802a4d89b6e7f500ace7e70b01a1dab3335d5 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Tue, 19 Jan 2016 10:19:50 +0900 Subject: [PATCH 096/272] Add translations for the Add Extension modal - Adds three translations for this placeholder dialog. - Updates the instructions to mention Composer. - Supports --- extensions/lang-english/locale/core.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index b77414943..4f57d2304 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -7,6 +7,12 @@ core: # Translations in this namespace are used by the admin interface. admin: + # These translations are used in the placeholder Add Extension modal dialog. + add_extension: + developer_text: "If you're a developer, you can read the docs and have a go at building your own extensions." + install_text: "In the meantime, you can look for extensions at the Flarum Community site and install them manually using Composer." + temporary_text: "One day in the not-too-distant future, this dialog will allow you to add an extension to your forum with ease. We're building an ecosystem as we speak!" + # These translations are used in the Appearance page. appearance: colored_header_label: Colored Header From 4374d8d7c0266bb996b8f6f8ff995a0afa85274c Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 19 Jan 2016 17:19:08 +1030 Subject: [PATCH 097/272] Add Composer branch-alias This allows installations to require version 0.1.0 with minimum-stability=dev, and they will get the latest from master. See flarum/core#727 --- extensions/lang-english/composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index e8b1302f3..a60562af3 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -8,6 +8,9 @@ "flarum/core": "^0.1.0-beta.4" }, "extra": { + "branch-alias": { + "dev-master": "0.1.x-dev" + }, "flarum-extension": { "title": "English", "icon": { From 6127ebb8d73ca65e0ce54155b3c944154321b24a Mon Sep 17 00:00:00 2001 From: Sajjad Hasehmian Date: Thu, 4 Feb 2016 01:00:58 +0330 Subject: [PATCH 098/272] Add Profile mentions tab translations --- extensions/lang-english/locale/flarum-mentions.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml index 2a2b88d69..1690aa816 100644 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -11,6 +11,10 @@ flarum-mentions: composer: reply_to_post_text: "Reply to #{number}" + # These translations are used in the user profile page and profile popup. + user: + mentions_link: Mentions + # These translations are used by the Notifications dropdown, a.k.a. "the bell". notifications: others_text: => core.ref.some_others From ba34deb9986e63d17cdeb046504a57873c512158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Thu, 4 Feb 2016 18:49:12 +0100 Subject: [PATCH 099/272] Sort alphabetically the "user" key --- extensions/lang-english/locale/flarum-mentions.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml index 1690aa816..bc931f73c 100644 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -11,10 +11,6 @@ flarum-mentions: composer: reply_to_post_text: "Reply to #{number}" - # These translations are used in the user profile page and profile popup. - user: - mentions_link: Mentions - # These translations are used by the Notifications dropdown, a.k.a. "the bell". notifications: others_text: => core.ref.some_others @@ -33,3 +29,7 @@ flarum-mentions: settings: notify_post_mentioned_label: Someone replies to one of my posts notify_user_mentioned_label: Someone mentions me in a post + + # These translations are used in the user profile page and profile popup. + user: + mentions_link: Mentions From bac0b84b88159d42810493b8e285bcb0e19c756b Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 26 Feb 2016 14:00:03 +1030 Subject: [PATCH 100/272] Add validation message for username regex rule See flarum/core@445517ee84c15a9f1efd523766b9374d2f327484 --- extensions/lang-english/locale/validation.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index 7a4847d22..eaf006a53 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -67,3 +67,7 @@ validation: content: content name_singular: singular name name_plural: plural name + + custom: + username: + regex: "The username may only contain letters, numbers, and dashes." From d8cbe8a440f789d817f378c905e852ba5b075c97 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 7 Mar 2016 23:05:59 +1030 Subject: [PATCH 101/272] Update subscriptions setting translation; remove unused translation --- extensions/lang-english/locale/flarum-subscriptions.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/flarum-subscriptions.yml b/extensions/lang-english/locale/flarum-subscriptions.yml index 2a7317657..d9ed929ec 100644 --- a/extensions/lang-english/locale/flarum-subscriptions.yml +++ b/extensions/lang-english/locale/flarum-subscriptions.yml @@ -28,8 +28,7 @@ flarum-subscriptions: # These translations are used in the Settings page. settings: - forum_follow_after_reply_label: Automaticaly follow a discussion after you posted in the discussion - forum_heading: Forum + forum_follow_after_reply_label: Automatically follow discussions that I reply to notify_new_post_label: Someone posts in a discussion I'm following # These translations are used in the subscription menu displayed to the right of the post stream. From f567f7dd5b84dafc502d75a9cbc2a8eab9144a5e Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 11 Mar 2016 12:45:29 +1030 Subject: [PATCH 102/272] Update translations for sudo mode removal (flarum/core#674) --- extensions/lang-english/locale/core.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 4f57d2304..661b969e2 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -139,7 +139,9 @@ core: # These translations are used in the Change Email modal dialog. change_email: confirmation_message: => core.ref.confirmation_email_sent + confirm_password_label: Confirm Password dismiss_button: => core.ref.okay + incorrect_password_message: The password you entered is incorrect. submit_button: => core.ref.save_changes title: => core.ref.change_email @@ -178,12 +180,6 @@ core: submit_button: Post Reply view_button: View - # These translations are used in the Confirm Password modal dialog. - confirm_password: - password_placeholder: => core.ref.password - submit_button: => core.ref.confirm_password - title: => core.ref.confirm_password - # These translations are used by the discussion control buttons. discussion_controls: cannot_reply_button: Can't Reply @@ -432,7 +428,6 @@ core: all_discussions: All Discussions change_email: Change Email change_password: Change Password - confirm_password: Confirm Password confirmation_email_sent: "We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." delete: Delete delete_forever: Delete Forever From 49ab64960f526ebc6d29904ffa56c8dc6ccb8de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Sun, 13 Mar 2016 02:28:48 +0100 Subject: [PATCH 103/272] Add some new Laravel's validation rules. Refers to: - https://github.com/laravel/laravel/commit/ef6b5a6343f6e1b0ab48e7feb5fac5a07584752d - https://github.com/laravel/laravel/commit/fa6c48d27c54d7495e64a9ace39392d29014e46a - https://github.com/laravel/laravel/commit/c36799dddeaff2a0129b2dc2a18d34651463b9a8 - https://github.com/laravel/laravel/commit/789c75c24ace662218d4656d3754fc343e34bac6 --- extensions/lang-english/locale/validation.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index eaf006a53..6e3936ba3 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -19,11 +19,13 @@ validation: different: "The :attribute and :other must be different." digits: "The :attribute must be :digits digits." digits_between: "The :attribute must be between :min and :max digits." + distinct: "The :attribute field has a duplicate value." email: "The :attribute must be a valid email address." exists: "The selected :attribute is invalid." filled: "The :attribute field is required." image: "The :attribute must be an image." in: "The selected :attribute is invalid." + in_array: "The :attribute field does not exist in :other." integer: "The :attribute must be an integer." ip: "The :attribute must be a valid IP address." json: "The :attribute must be a valid JSON string." @@ -40,6 +42,7 @@ validation: array: "The :attribute must have at least :min items." not_in: "The selected :attribute is invalid." numeric: "The :attribute must be a number." + present: "The :attribute field must be present." regex: "The :attribute format is invalid." required: "The :attribute field is required." required_if: "The :attribute field is required when :other is :value." From 3965b3e3d0111def294451fd5663424832014686 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Mon, 14 Mar 2016 20:05:57 +0900 Subject: [PATCH 104/272] Added cluster for ext-pusher Missing translation from flarum/flarum-ext-pusher#6. Thanks, @Luceos. --- extensions/lang-english/locale/flarum-pusher.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/flarum-pusher.yml b/extensions/lang-english/locale/flarum-pusher.yml index ae2686411..184489bc2 100644 --- a/extensions/lang-english/locale/flarum-pusher.yml +++ b/extensions/lang-english/locale/flarum-pusher.yml @@ -9,6 +9,7 @@ flarum-pusher: # These translations are used in the Pusher Settings modal dialog. pusher_settings: + app_cluster_label: Cluster app_id_label: App ID app_key_label: App Key app_secret_label: App Secret From 288b4b5f9a1a5e3d974f1c36e0ca8c8bd6d148fd Mon Sep 17 00:00:00 2001 From: Sajjad Hasehmian Date: Wed, 16 Mar 2016 15:27:16 +0330 Subject: [PATCH 105/272] Add resend confirmation email strings --- extensions/lang-english/locale/core.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 661b969e2..4714330ca 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -333,6 +333,11 @@ core: posts_link: Posts settings_link: => core.ref.settings + # These translations are used in unverified user alert box. + user_confirmation: + alert_message: You need to confirm your email address. + resend_button: Resend Confirmation Email + # These translations are found on the user profile page (admin function). user_controls: button: Controls From 1cb6ebb51f1e0346a01d6ae322560437e54c581b Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 23 Mar 2016 22:15:19 +1030 Subject: [PATCH 106/272] Changes to user email confirmation translations - Remove unused messages in log_in + sign_up - Reuse core.ref.confirmation_email_sent --- extensions/lang-english/locale/core.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 4714330ca..7c93d967b 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -246,7 +246,6 @@ core: # These translations are used in the Log In modal dialog. log_in: - confirmation_required_message: "You need to confirm your email before you can log in. We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." forgot_password_link: "Forgot password?" invalid_login_message: Your login details were incorrect. password_placeholder: => core.ref.password @@ -310,7 +309,6 @@ core: # These translations are used in the Sign Up modal dialog. sign_up: - confirmation_message: => core.ref.confirmation_email_sent email_placeholder: => core.ref.email dismiss_button: => core.ref.okay log_in_text: "Already have an account? Log In" @@ -333,11 +331,6 @@ core: posts_link: Posts settings_link: => core.ref.settings - # These translations are used in unverified user alert box. - user_confirmation: - alert_message: You need to confirm your email address. - resend_button: Resend Confirmation Email - # These translations are found on the user profile page (admin function). user_controls: button: Controls @@ -345,6 +338,12 @@ core: delete_confirmation: "Are you sure you want to delete this user? All of the user's posts will be deleted." edit_button: => core.ref.edit + # These translations are used in the alert that is shown when a new user has not confirmed their email address. + user_email_confirmation: + alert_message: => core.ref.confirmation_email_sent + resend_button: Resend Confirmation Email + sent_message: Sent + # Translations in this namespace are used by the forum and admin interfaces. lib: From a7cdad857429baaae3eca80c36b9a4cde54f88b5 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 28 Mar 2016 15:47:14 +1030 Subject: [PATCH 107/272] Add specific error message for forgot password modal --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 7c93d967b..cf05fdee0 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -213,6 +213,7 @@ core: dismiss_button: => core.ref.okay email_placeholder: => core.ref.email email_sent_message: We've sent you an email containing a link to reset your password. Check your spam folder if you don't receive it within the next minute or two. + not_found_message: A user with that email address was not found. submit_button: Recover Password text: Enter your email address and we will send you a link to reset your password. title: Forgot Password From 7af9bd7c3071095491c3684486ed1b4de156dbcb Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 28 Mar 2016 16:06:29 +1030 Subject: [PATCH 108/272] Improve wording Thanks @maelsoucaze :) --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index cf05fdee0..d471ae877 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -213,7 +213,7 @@ core: dismiss_button: => core.ref.okay email_placeholder: => core.ref.email email_sent_message: We've sent you an email containing a link to reset your password. Check your spam folder if you don't receive it within the next minute or two. - not_found_message: A user with that email address was not found. + not_found_message: There is no user registered with that email address. submit_button: Recover Password text: Enter your email address and we will send you a link to reset your password. title: Forgot Password From 9d9e03295548c0cfc6ea30dab6e8865c80842ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Mon, 28 Mar 2016 07:59:37 +0200 Subject: [PATCH 109/272] Remove unnecessary double quotes --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index d471ae877..fde464538 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -195,7 +195,7 @@ core: # These translations are used in the discussion list. discussion_list: - empty_text: "It looks like there are no discussions here." + empty_text: It looks like there are no discussions here. load_more_button: => core.ref.load_more mark_as_read_tooltip: Mark as Read replied_text: "{username} replied {ago}" From f6f73da22a26d03d5feb7936fad3b2a35fcf4db7 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 29 Mar 2016 18:45:31 +1030 Subject: [PATCH 110/272] Require core v0.1.0-beta.5 --- extensions/lang-english/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index a60562af3..98b8bff7d 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -5,7 +5,7 @@ "keywords": ["locale"], "license": "MIT", "require": { - "flarum/core": "^0.1.0-beta.4" + "flarum/core": "^0.1.0-beta.5" }, "extra": { "branch-alias": { From 54357f916dda71934975264a9f0999efd114e5e0 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Wed, 30 Mar 2016 20:43:34 +0900 Subject: [PATCH 111/272] Split up info text for renaming discussions Refs flarum/core#428. --- extensions/lang-english/locale/core.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index fde464538..be6f4afa1 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -284,7 +284,9 @@ core: # These translations are displayed between posts in the post stream. post_stream: - discussion_renamed_text: "{username} changed the title from {old} to {new}." + discussion_renamed_text: "{username} changed the title" + discussion_renamed_text_old: "from {old}" + discussion_renamed_text_new: "to {new}" load_more_button: => core.ref.load_more reply_placeholder: => core.ref.write_a_reply time_lapsed_text: "{period} later" From afac1f6d1991812655cc5ab877b71db6beb6bc90 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Wed, 30 Mar 2016 21:49:53 +0900 Subject: [PATCH 112/272] Update locale keys and contents Refs flarum/core#428. --- extensions/lang-english/locale/core.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index be6f4afa1..f0da8260c 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -284,9 +284,9 @@ core: # These translations are displayed between posts in the post stream. post_stream: - discussion_renamed_text: "{username} changed the title" - discussion_renamed_text_old: "from {old}" - discussion_renamed_text_new: "to {new}" + discussion_renamed_new_text: "New: {new}" + discussion_renamed_old_text: "Old: {old}" + discussion_renamed_text: "{username} changed the title." load_more_button: => core.ref.load_more reply_placeholder: => core.ref.write_a_reply time_lapsed_text: "{period} later" From 815133473b039dac5215059011efb16fba406b9c Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 1 Apr 2016 10:09:15 +0900 Subject: [PATCH 113/272] Adapt latest changes to DiscussionRenamedPost Refs flarum/core#428. --- extensions/lang-english/locale/core.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index f0da8260c..e1bafe9d5 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -284,9 +284,8 @@ core: # These translations are displayed between posts in the post stream. post_stream: - discussion_renamed_new_text: "New: {new}" - discussion_renamed_old_text: "Old: {old}" - discussion_renamed_text: "{username} changed the title." + discussion_renamed_old_text: "The old title was: \"{old}\"" + discussion_renamed_text: "{username} changed the title to {new}." load_more_button: => core.ref.load_more reply_placeholder: => core.ref.write_a_reply time_lapsed_text: "{period} later" From bf536f32a0820461d68b61e3323d4dd40e4ade63 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 1 Apr 2016 10:48:19 +0900 Subject: [PATCH 114/272] Update key and quotes As suggested by @dcsjapan. Refs flarum/core#428. --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index e1bafe9d5..afec56415 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -284,7 +284,7 @@ core: # These translations are displayed between posts in the post stream. post_stream: - discussion_renamed_old_text: "The old title was: \"{old}\"" + discussion_renamed_old_tooltip: 'The old title was: "{old}"' discussion_renamed_text: "{username} changed the title to {new}." load_more_button: => core.ref.load_more reply_placeholder: => core.ref.write_a_reply From 8a3ea800ddd653dfcfaee6eb6433a6d71aea6a1e Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Thu, 7 Apr 2016 17:49:55 +0900 Subject: [PATCH 115/272] Fix unextracted translations in core blade files. - Adds language resources extracted from `reset.blade.php`. - Moves `basic` key namespace to `views`. - Subdivides `views` namespace based on filename. - Supports #918. --- extensions/lang-english/locale/core.yml | 39 +++++++++++++++++++------ 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index afec56415..9e1c8ae78 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -139,7 +139,7 @@ core: # These translations are used in the Change Email modal dialog. change_email: confirmation_message: => core.ref.confirmation_email_sent - confirm_password_label: Confirm Password + confirm_password_label: => core.ref.confirm_password dismiss_button: => core.ref.okay incorrect_password_message: The password you entered is incorrect. submit_button: => core.ref.save_changes @@ -375,13 +375,31 @@ core: three_text: "{first}, {second}, and {third}" two_text: "{first} and {second}" - # Translations in this namespace are used in basic HTML interface. - basic: - javascript_disabled_message: This site is best viewed in a modern browser with JavaScript enabled. - load_error_message: Something went wrong while trying to load the full version of this site. - loading_text: Loading... - next_page_button: Next Page - previous_page_button: Previous Page + # Translations in this namespace are used in views other than Flarum's normal JS client. + views: + + # Translations in this namespace are displayed by the basic HTML content loader. + content: + javascript_disabled_message: This site is best viewed in a modern browser with JavaScript enabled. + load_error_message: Something went wrong while trying to load the full version of this site. + loading_text: Loading... + + # Translations in this namespace are displayed in the basic HTML discussion view. + discussion: + next_page_button: => core.ref.next_page + previous_page_button: Previous Page + + # Translations in this namespace are displayed by the basic HTML discussion index. + index: + all_discussions_heading: => core.ref.all_discussions + next_page_button: => core.ref.next_page + + # Translations in this namespace are displayed by the Reset Password interface. + reset: + confirm_password_label: => core.ref.confirm_password + password_label: => core.ref.password + submit_button: Reset Password + title: => core.ref.reset_your_password # Translations in this namespace are used in emails sent by the forum. email: @@ -423,7 +441,7 @@ core: {url} If you do not wish to change your password, just ignore this email and nothing will happen. - subject: Reset Your Password + subject: => core.ref.reset_your_password ## # REUSED TRANSLATIONS - These keys should not be used directly in code! @@ -434,6 +452,7 @@ core: all_discussions: All Discussions change_email: Change Email change_password: Change Password + confirm_password: Confirm Password confirmation_email_sent: "We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." delete: Delete delete_forever: Delete Forever @@ -444,10 +463,12 @@ core: log_in: Log In log_out: Log Out mark_all_as_read: Mark All as Read + next_page: Next Page notifications: Notifications okay: OK # Referenced by flarum-tags.yml password: Password reply: Reply # Referenced by flarum-mentions.yml + reset_your_password: Reset Your Password restore: Restore save_changes: Save Changes # Referenced by flarum-suspend.yml, flarum-tags.yml settings: Settings From 18d57e282c1a01db8cdabef137c0afea4484f237 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Fri, 15 Apr 2016 12:34:05 +0900 Subject: [PATCH 116/272] Add translatable string for Flags - Adds translation for Flags notification. - Supports flarum/flarum-ext-flags#6. --- extensions/lang-english/locale/flarum-flags.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml index ab9adac8b..30f578886 100644 --- a/extensions/lang-english/locale/flarum-flags.yml +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -37,6 +37,7 @@ flarum-flags: # These translations are used by the Flagged Posts dropdown, a.k.a. "the flag". flagged_posts: empty_text: No Flags + item_text: "{username} in {discussion}" title: => flarum-flags.ref.flagged_posts tooltip: => flarum-flags.ref.flagged_posts From 0a1dc4c52e77b5756562fd3b342b3ea7fbaf3b9c Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sun, 17 Apr 2016 22:34:53 +0900 Subject: [PATCH 117/272] Translation for avatar upload tooltip Refs flarum/core#249. --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 9e1c8ae78..8cc9c6848 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -324,6 +324,7 @@ core: user: avatar_remove_button: Remove avatar_upload_button: Upload + avatar_upload_tooltip: Upload a new avatar bio_placeholder: Write something about yourself discussions_link: => core.ref.discussions in_discussion_text: "In {discussion}" From 9f7c68ffe1c58711d716ef02a183907cd814ee99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sevilla=20Mart=C3=ADn?= Date: Sat, 14 May 2016 23:01:46 -0400 Subject: [PATCH 118/272] Admin SMTP UI Translations (#72) * Added SMTP page & nav translations (includes SMTP on texts) Changed from mail.* to smtp.* (thanks @dcsjapan) Added _label to labels (thanks again) * Making translations with better quality (comment from @b9a10a1) * Changed SMTP to Email, some minor changes, organization, some headings, refs... * Updated ...SMTP page... comment to ...email page... * updated translation keys to alphabetically, \& added quotes around email_text (thanks @maelsoucaze) * Wow, so many extra spaces... I don't know when I added them :( * Changed "adresses" to "addresses" --- extensions/lang-english/locale/core.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 8cc9c6848..1a08af52b 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -69,6 +69,22 @@ core: submit_button: => core.ref.save_changes title: Create Group + # These translations are used in the email page of the admin interface. + email: + account_heading: SMTP Account + addresses_heading: Addresses + driver_label: Driver + encryption_label: Encryption + from_label: Sender + heading: => core.ref.email + host_label: Host + password_label: Password + port_label: Port + server_heading: SMTP Server + submit_button: => core.ref.save_changes + text: Configure the SMTP settings and addresses your forum will use to send email. + username_label: Username + # These translations are used in the Extensions page. extensions: add_button: Add Extension @@ -93,6 +109,8 @@ core: basics_text: "Set your forum title, language, and other basic settings." dashboard_button: Dashboard dashboard_text: Your forum at a glance. + email_button: => core.ref.email + email_text: "Configure your forum's email settings." extensions_button: Extensions extensions_text: Add extra functionality to your forum and make it your own. permissions_button: Permissions From 69a3acdb6d2c443f4efec474e8eaf1b90ba36e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Sun, 15 May 2016 11:49:40 +0200 Subject: [PATCH 119/272] Use existing reused translation keys. (#73) --- extensions/lang-english/locale/core.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 1a08af52b..98eb358bf 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -78,12 +78,12 @@ core: from_label: Sender heading: => core.ref.email host_label: Host - password_label: Password + password_label: => core.ref.password port_label: Port server_heading: SMTP Server submit_button: => core.ref.save_changes text: Configure the SMTP settings and addresses your forum will use to send email. - username_label: Username + username_label: => core.ref.username # These translations are used in the Extensions page. extensions: From e4775c6a914a2515c9936a6946b281ecae147ac8 Mon Sep 17 00:00:00 2001 From: Sjjad Hashemian Date: Wed, 18 May 2016 11:05:35 +0430 Subject: [PATCH 120/272] Add Quote button translation for mentions --- extensions/lang-english/locale/flarum-mentions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml index bc931f73c..c4419dc57 100644 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -22,6 +22,7 @@ flarum-mentions: mentioned_by_self_text: "{users} replied to this." # Can be pluralized to agree with the number of users! mentioned_by_text: "{users} replied to this." # Can be pluralized to agree with the number of users! others_text: => core.ref.some_others + quote_button: Quote reply_link: => core.ref.reply you_text: => core.ref.you From 2c57f74608d3ad94da2bae1a7e21d14fd27d43d7 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 21 May 2016 20:28:29 +0930 Subject: [PATCH 121/272] Add translation for post "Edited" indicator --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 98eb358bf..aa1a81cfe 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -283,6 +283,7 @@ core: # These translations are used by tooltips displayed for individual posts. post: + edited_text: "Edited" edited_tooltip: "{username} edited {ago}" number_tooltip: "Post #{number}" From 93de8f4a7d5aec6ada054f7a9283f69892ed5550 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 21 May 2016 20:28:38 +0930 Subject: [PATCH 122/272] Change dismiss flag from tooltip into button --- extensions/lang-english/locale/flarum-flags.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml index 30f578886..c1860d2c0 100644 --- a/extensions/lang-english/locale/flarum-flags.yml +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -43,7 +43,7 @@ flarum-flags: # These translations are used by the frame displayed around flagged posts. post: - dismiss_flag_tooltip: Dismiss Flag + dismiss_flag_button: Dismiss Flag flagged_by_text: "{username} flagged" flagged_by_with_reason_text: "{username} flagged as {reason}" From 58daef61c37232b209ee44eb5124960175708c23 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sat, 21 May 2016 21:32:54 +0900 Subject: [PATCH 123/272] Clean up translation keys - Removes two obsolete keys from the Extensions page. - Corrects the suffix on a key in the Change Email modal. - Extracts the title of the Edit User modal. - Reorders keys in `core.email` namespace. - Supports flarum/core#964 --- extensions/lang-english/locale/core.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index aa1a81cfe..be4ef7148 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -88,8 +88,6 @@ core: # These translations are used in the Extensions page. extensions: add_button: Add Extension - disable_button: Disable - enable_button: Enable settings_button: => core.ref.settings uninstall_button: Uninstall @@ -157,7 +155,7 @@ core: # These translations are used in the Change Email modal dialog. change_email: confirmation_message: => core.ref.confirmation_email_sent - confirm_password_label: => core.ref.confirm_password + confirm_password_placeholder: => core.ref.confirm_password dismiss_button: => core.ref.okay incorrect_password_message: The password you entered is incorrect. submit_button: => core.ref.save_changes @@ -224,6 +222,7 @@ core: email_label: => core.ref.email password_label: => core.ref.password submit_button: => core.ref.save_changes + title: Edit User username_label: => core.ref.username # These translations are used in the Forgot Password modal dialog. @@ -426,6 +425,7 @@ core: # These translations are used in emails sent when users register new accounts. activate_account: + subject: Activate Your New Account body: | Hey {username}! @@ -435,10 +435,10 @@ core: {url} If you did not sign up, please ignore this email. - subject: Activate Your New Account # These translations are used in emails sent when users change their email address. confirm_email: + subject: Confirm Your New Email Address body: | Hey {username}! @@ -448,10 +448,10 @@ core: {url} If this was not you, please ignore this email. - subject: Confirm Your New Email Address # These translations are used in emails sent when users ask to reset their passwords. reset_password: + subject: => core.ref.reset_your_password body: | Hey {username}! @@ -461,7 +461,6 @@ core: {url} If you do not wish to change your password, just ignore this email and nothing will happen. - subject: => core.ref.reset_your_password ## # REUSED TRANSLATIONS - These keys should not be used directly in code! From cf9e032693457fdb2109887944e74a138329ad58 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 21 May 2016 22:03:31 +0930 Subject: [PATCH 124/272] Add translation for "view post IP addresses" permission --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index aa1a81cfe..035c47477 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -135,6 +135,7 @@ core: sign_up_label: Sign up start_discussions_label: Start discussions view_discussions_label: View discussions + view_post_ips_label: View post IP addresses # These translations are used in the dropdown menus on the Permissions page. permissions_controls: From dfd614e6eaf2fbbf21260f84f9be106d68719bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Mon, 23 May 2016 15:59:04 +0200 Subject: [PATCH 125/272] Add language line for image dimensions validation rule (#78) See: https://github.com/laravel/laravel/commit/da64a014e749d1d4164b147fe79bfd7d86158aa5 --- extensions/lang-english/locale/validation.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index 6e3936ba3..6dfcfc885 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -19,6 +19,7 @@ validation: different: "The :attribute and :other must be different." digits: "The :attribute must be :digits digits." digits_between: "The :attribute must be between :min and :max digits." + dimensions: "The :attribute has invalid image dimensions." distinct: "The :attribute field has a duplicate value." email: "The :attribute must be a valid email address." exists: "The selected :attribute is invalid." From bf31979a596275175cc440224a2725cf4aff2581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Mon, 23 May 2016 15:59:16 +0200 Subject: [PATCH 126/272] Remove unnecessary double quotes (#77) --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index dc035b79b..1c5ee04ad 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -283,7 +283,7 @@ core: # These translations are used by tooltips displayed for individual posts. post: - edited_text: "Edited" + edited_text: Edited edited_tooltip: "{username} edited {ago}" number_tooltip: "Post #{number}" From a4a318523322958a87c377782a48e21e08f309c1 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 27 May 2016 14:42:31 +0930 Subject: [PATCH 127/272] Add new translations for flarum-ext-approval --- .../lang-english/locale/flarum-approval.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/flarum-approval.yml b/extensions/lang-english/locale/flarum-approval.yml index b372f5e0f..55c631ae2 100644 --- a/extensions/lang-english/locale/flarum-approval.yml +++ b/extensions/lang-english/locale/flarum-approval.yml @@ -10,15 +10,28 @@ flarum-approval: # These translations are used in the Permissions page of the admin interface. permissions: approve_posts_label: Approve posts - reply_without_approval_label: Reply without approval + reply_without_approval_label: Reply to discussions without approval + start_discussions_without_approval_label: Start discussions without approval # Translations in this namespace are used by the forum user interface. forum: + # These translations are displayed as tooltips for discussion badges. + badge: + awaiting_approval_tooltip: => flarum-approval.ref.awaiting_approval + # These translations are displayed in the post header. post: - awaiting_approval_text: Awaiting approval + awaiting_approval_text: => flarum-approval.ref.awaiting_approval # These translations are used by the post control buttons. post_controls: approve_button: Approve + + ## + # REUSED TRANSLATIONS - These keys should not be used directly in code! + ## + + # Translations in this namespace are referenced by two or more unique keys. + ref: + awaiting_approval: Awaiting approval From c67c7bf63847353e45010446fd68d2fe65d8ea44 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sat, 4 Jun 2016 16:07:07 +0900 Subject: [PATCH 128/272] Add translations for API error messages - Adds `:attribute` values for use in `validation.between.numeric`. - Partially solves flarum/core/#973. - Code needs to be revised to use these phrases. --- extensions/lang-english/locale/flarum-tags.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index d21809ca7..701f003b9 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -84,6 +84,13 @@ flarum-tags: removed_tags_text: "{username} removed the {tagsRemoved}." tags_text: "{tags} tag|{tags} tags" + # Translations in this namespace are used in messages output by the API. + api: + + # These translations are used in messages regarding the number of tags assigned to a discussion. + primary_tag_count_text: number of primary tags + secondary_tag_count_text: number of secondary tags + # Translations in this namespace are used by the forum and admin interfaces. lib: From 4a744b1dbd7612f8bc72a546da3ce6f1c23258d1 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 4 Jun 2016 18:45:12 +0930 Subject: [PATCH 129/272] Add new translations for admin Appearance page --- extensions/lang-english/locale/core.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 1c5ee04ad..8ed7655a7 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -18,11 +18,18 @@ core: colored_header_label: Colored Header colors_heading: Colors colors_text: "Choose two colors to theme your forum with. The first will be used as a highlight color, while the second will be used to style background elements." + custom_header_heading: Custom Header + custom_header_text: Add HTML to be displayed at the very top of the page, above Flarum's own header. custom_styles_heading: Custom Styles custom_styles_text: Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles. dark_mode_label: Dark Mode edit_css_button: Edit Custom CSS + edit_header_button: Edit Custom Header enter_hex_message: Please enter a hexadecimal color code. + favicon_heading: Favicon + favicon_text: Upload an image to be displayed as the forum's shortcut icon. + logo_heading: Logo + logo_text: Upload an image to be displayed in place of the forum title. submit_button: => core.ref.save_changes # These translations are used in the Basics page. @@ -69,6 +76,12 @@ core: submit_button: => core.ref.save_changes title: Create Group + # These translations are used in the Edit Custom Header modal dialog. + edit_header: + customize_text: Add HTML to be displayed at the very top of the page, above Flarum's own header. + submit_button: => core.ref.save_changes + title: Edit Custom Header + # These translations are used in the email page of the admin interface. email: account_heading: SMTP Account @@ -150,6 +163,11 @@ core: settings: submit_button: => core.ref.save_changes + # These translations are used in image upload buttons. + upload_image: + remove_button: Remove + upload_button: Choose an Image... + # Translations in this namespace are used by the forum user interface. forum: From ae3fab8a34c3b4b86b8333d707437b3d4dcf6721 Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sat, 4 Jun 2016 18:26:46 +0900 Subject: [PATCH 130/272] Adjust ID key name and move API key - Adjusts the key for the "Follow after reply" setting. - Supports flarum/flarum-ext-subscriptions/pull/10. - Moves `api` section below `views`. --- .../lang-english/locale/flarum-subscriptions.yml | 2 +- extensions/lang-english/locale/flarum-tags.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/extensions/lang-english/locale/flarum-subscriptions.yml b/extensions/lang-english/locale/flarum-subscriptions.yml index d9ed929ec..03b11d193 100644 --- a/extensions/lang-english/locale/flarum-subscriptions.yml +++ b/extensions/lang-english/locale/flarum-subscriptions.yml @@ -28,7 +28,7 @@ flarum-subscriptions: # These translations are used in the Settings page. settings: - forum_follow_after_reply_label: Automatically follow discussions that I reply to + follow_after_reply_label: Automatically follow discussions that I reply to notify_new_post_label: Someone posts in a discussion I'm following # These translations are used in the subscription menu displayed to the right of the post stream. diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index 701f003b9..b7a216c2c 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -84,6 +84,12 @@ flarum-tags: removed_tags_text: "{username} removed the {tagsRemoved}." tags_text: "{tags} tag|{tags} tags" + # Translations in this namespace are used by the forum and admin interfaces. + lib: + + # This translation is displayed in place of the name of a tag that's been deleted. + deleted_tag_text: Deleted + # Translations in this namespace are used in messages output by the API. api: @@ -91,12 +97,6 @@ flarum-tags: primary_tag_count_text: number of primary tags secondary_tag_count_text: number of secondary tags - # Translations in this namespace are used by the forum and admin interfaces. - lib: - - # This translation is displayed in place of the name of a tag that's been deleted. - deleted_tag_text: Deleted - ## # REUSED TRANSLATIONS - These keys should not be used directly in code! ## From ec00660cba410222ef74d44bdb0a0a2451aec390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Sat, 4 Jun 2016 14:57:57 +0200 Subject: [PATCH 131/272] Quote strings with special or reserved characters These strings contain commas and should be quoted. Source: http://symfony.com/doc/current/components/yaml/yaml_format.html#strings --- extensions/lang-english/locale/core.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 8ed7655a7..01f584fa4 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -19,7 +19,7 @@ core: colors_heading: Colors colors_text: "Choose two colors to theme your forum with. The first will be used as a highlight color, while the second will be used to style background elements." custom_header_heading: Custom Header - custom_header_text: Add HTML to be displayed at the very top of the page, above Flarum's own header. + custom_header_text: "Add HTML to be displayed at the very top of the page, above Flarum's own header." custom_styles_heading: Custom Styles custom_styles_text: Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles. dark_mode_label: Dark Mode @@ -78,7 +78,7 @@ core: # These translations are used in the Edit Custom Header modal dialog. edit_header: - customize_text: Add HTML to be displayed at the very top of the page, above Flarum's own header. + customize_text: "Add HTML to be displayed at the very top of the page, above Flarum's own header." submit_button: => core.ref.save_changes title: Edit Custom Header From f72295634b44e574f4137b31ab234b1b730d1e0d Mon Sep 17 00:00:00 2001 From: dcsjapan Date: Sat, 4 Jun 2016 23:30:54 +0900 Subject: [PATCH 132/272] Move attributes to validation - Moves attributes added in #79 to `validation.yml`. - See flarum/core#973. - `SaveTagsToDatabase.php` need to be revised to use these phrases. - Caution: key names have been changed as well! --- extensions/lang-english/locale/flarum-tags.yml | 7 ------- extensions/lang-english/locale/validation.yml | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index b7a216c2c..d21809ca7 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -90,13 +90,6 @@ flarum-tags: # This translation is displayed in place of the name of a tag that's been deleted. deleted_tag_text: Deleted - # Translations in this namespace are used in messages output by the API. - api: - - # These translations are used in messages regarding the number of tags assigned to a discussion. - primary_tag_count_text: number of primary tags - secondary_tag_count_text: number of secondary tags - ## # REUSED TRANSLATIONS - These keys should not be used directly in code! ## diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index 6dfcfc885..b4948ebf5 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -71,6 +71,8 @@ validation: content: content name_singular: singular name name_plural: plural name + tag_count_primary: number of primary tags + tag_count_secondary: number of secondary tags custom: username: From dd2376e42fa09caca231b8c336b28f0f6e1bec0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Tue, 5 Jul 2016 16:47:32 +0200 Subject: [PATCH 133/272] Add language line for file validation rule. (#83) See: https://github.com/laravel/laravel/commit/cd032040441787c827aa07c428ae753281b685df --- extensions/lang-english/locale/validation.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index b4948ebf5..807dbe366 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -23,6 +23,7 @@ validation: distinct: "The :attribute field has a duplicate value." email: "The :attribute must be a valid email address." exists: "The selected :attribute is invalid." + file: "The :attribute must be a file." filled: "The :attribute field is required." image: "The :attribute must be an image." in: "The selected :attribute is invalid." From 619533fac2d91a59296faf2e639b6ff174e48c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl?= Date: Mon, 26 Sep 2016 22:07:28 +0200 Subject: [PATCH 134/272] Update to the latest Laravel version Laravel's related commits: https://github.com/laravel/laravel/commit/537b6288fba5181bff6011facecbf05b6de0bbb0 https://github.com/laravel/laravel/commit/dd1e64a7a4cdcec6c846aed13330d6523d457b91 https://github.com/laravel/laravel/commit/1562407562859a880f5f494647d5c52f8af8d44e and https://github.com/laravel/laravel/commit/7da6edf8c14772f14ff11616199fb16bd19909ae --- extensions/lang-english/locale/validation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index 807dbe366..5d5df208a 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -37,6 +37,7 @@ validation: string: "The :attribute may not be greater than :max characters." array: "The :attribute may not have more than :max items." mimes: "The :attribute must be a file of type: :values." + mimetypes: "The :attribute must be a file of type: :values." min: numeric: "The :attribute must be at least :min." file: "The :attribute must be at least :min kilobytes." @@ -62,6 +63,7 @@ validation: string: "The :attribute must be a string." timezone: "The :attribute must be a valid zone." unique: "The :attribute has already been taken." + uploaded: "The :attribute failed to upload." url: "The :attribute format is invalid." attributes: From 79711963fd7ff53c95dc026e0743b87c8cfea07b Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 19 Oct 2016 21:13:02 +1030 Subject: [PATCH 135/272] v0.1.0-beta.6 --- extensions/lang-english/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 98b8bff7d..b38f86645 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -5,7 +5,7 @@ "keywords": ["locale"], "license": "MIT", "require": { - "flarum/core": "^0.1.0-beta.5" + "flarum/core": "^0.1.0-beta.6" }, "extra": { "branch-alias": { From c90932071c4c03d3a28323c13834147647209d9a Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sun, 27 Nov 2016 19:41:18 +1030 Subject: [PATCH 136/272] Move username validation message for specificity --- extensions/lang-english/locale/core.yml | 4 ++++ extensions/lang-english/locale/validation.yml | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 01f584fa4..9ccc311fa 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -439,6 +439,10 @@ core: submit_button: Reset Password title: => core.ref.reset_your_password + # Translations in this namespace are used in messages output by the API. + api: + invalid_username_message: "The username may only contain letters, numbers, and dashes." + # Translations in this namespace are used in emails sent by the forum. email: diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index 5d5df208a..d24754ec4 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -76,7 +76,3 @@ validation: name_plural: plural name tag_count_primary: number of primary tags tag_count_secondary: number of secondary tags - - custom: - username: - regex: "The username may only contain letters, numbers, and dashes." From 6822ffb26fbb09d76deffd42d89f43612d6e2bbc Mon Sep 17 00:00:00 2001 From: Sajjad Hashemian Date: Tue, 29 Nov 2016 11:31:45 +0330 Subject: [PATCH 137/272] Add remember me label --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 9ccc311fa..935483da4 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -286,6 +286,7 @@ core: forgot_password_link: "Forgot password?" invalid_login_message: Your login details were incorrect. password_placeholder: => core.ref.password + remember_me_label: Remember me for two weeks sign_up_text: "Don't have an account? Sign Up" submit_button: => core.ref.log_in title: => core.ref.log_in From de19cc9d5551b3bf192a4fc87b42ae6fe4ab8b21 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Fri, 2 Dec 2016 17:58:09 +0100 Subject: [PATCH 138/272] Add language lines for before_or_equal and after_or_equal See: https://github.com/laravel/laravel/commit/fa1eae35b9ce5bd278cbc85571be2474192181de --- extensions/lang-english/locale/validation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index d24754ec4..c65e934a2 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -2,11 +2,13 @@ validation: accepted: "The :attribute must be accepted." active_url: "The :attribute is not a valid URL." after: "The :attribute must be a date after :date." + after_or_equal: "The :attribute must be a date after or equal to :date." alpha: "The :attribute may only contain letters." alpha_dash: "The :attribute may only contain letters, numbers, and dashes." alpha_num: "The :attribute may only contain letters and numbers." array: "The :attribute must be an array." before: "The :attribute must be a date before :date." + before_or_equal: "The :attribute must be a date before or equal to :date." between: numeric: "The :attribute must be between :min and :max." file: "The :attribute must be between :min and :max kilobytes." From 42d4a3c970e62d6e84b9358d9dfe28725557be28 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Tue, 27 Dec 2016 01:56:02 +0100 Subject: [PATCH 139/272] Add missing translation Associated with: https://github.com/flarum/core/pull/1094 --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 935483da4..23fef7c6d 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -12,6 +12,7 @@ core: developer_text: "If you're a developer, you can read the docs and have a go at building your own extensions." install_text: "In the meantime, you can look for extensions at the Flarum Community site and install them manually using Composer." temporary_text: "One day in the not-too-distant future, this dialog will allow you to add an extension to your forum with ease. We're building an ecosystem as we speak!" + title: Add Extension # These translations are used in the Appearance page. appearance: From d2d7827caf6bbb2fc28c9151f4f595f039a8deb4 Mon Sep 17 00:00:00 2001 From: renyuneyun Date: Sat, 24 Dec 2016 22:53:08 +0000 Subject: [PATCH 140/272] add missing translations (for EditUserModal.js) --- extensions/lang-english/locale/core.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 935483da4..6fc3b458f 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -238,10 +238,16 @@ core: # These translations are used in the Edit User modal dialog (admin function). edit_user: + activate_button: Activate User + email_heading: => core.ref.email email_label: => core.ref.email + groups_heading: Groups + password_heading: => core.ref.password password_label: => core.ref.password + set_password_label: Set new password submit_button: => core.ref.save_changes title: Edit User + username_heading: => core.ref.username username_label: => core.ref.username # These translations are used in the Forgot Password modal dialog. From 2ed9a70ed282cd451abb98a0f0495cfd37169caa Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Sun, 1 Jan 2017 22:41:58 +0100 Subject: [PATCH 141/272] Update year --- extensions/lang-english/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/LICENSE b/extensions/lang-english/LICENSE index eae9c24fb..ef81bf33a 100644 --- a/extensions/lang-english/LICENSE +++ b/extensions/lang-english/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2016 Toby Zerner +Copyright (c) 2015-2017 Toby Zerner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From f39e2b1ee2ed53f4f11a17d9dbf450ef081d886b Mon Sep 17 00:00:00 2001 From: Wiwat Srisattha Date: Sun, 19 Feb 2017 08:56:43 +0700 Subject: [PATCH 142/272] Rename discussion modal translations --- extensions/lang-english/locale/core.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 27680f01a..1826b77f8 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -225,10 +225,14 @@ core: delete_forever_button: => core.ref.delete_forever log_in_to_reply_button: Log In to Reply rename_button: Rename - rename_text: "Enter a new title for this discussion:" reply_button: => core.ref.reply restore_button: => core.ref.restore + # These translations are used by the rename discussion modal. + rename_modal: + title: "Enter a new title for this discussion" + submit_button: "Rename" + # These translations are used in the discussion list. discussion_list: empty_text: It looks like there are no discussions here. From 3e4b9f40bd3d830e6fcd6147473f1986886f7db9 Mon Sep 17 00:00:00 2001 From: Wiwat Srisattha Date: Sun, 19 Feb 2017 09:02:29 +0700 Subject: [PATCH 143/272] Remove unnecessary double quotes --- extensions/lang-english/locale/core.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 1826b77f8..93326c01f 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -230,8 +230,8 @@ core: # These translations are used by the rename discussion modal. rename_modal: - title: "Enter a new title for this discussion" - submit_button: "Rename" + title: Enter a new title for this discussion + submit_button: Rename # These translations are used in the discussion list. discussion_list: From 7e84ed7e3c85bd4465ddf869b87e6f6cc4144954 Mon Sep 17 00:00:00 2001 From: VSN Reddy Janga Date: Mon, 20 Feb 2017 19:45:45 +0530 Subject: [PATCH 144/272] Hide diff for compiled diff files --- extensions/lang-english/.gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/.gitattributes b/extensions/lang-english/.gitattributes index f81350e7d..9e31e73e3 100644 --- a/extensions/lang-english/.gitattributes +++ b/extensions/lang-english/.gitattributes @@ -24,3 +24,5 @@ .gitattributes export-ignore .gitignore export-ignore README.md export-ignore + +js/*/dist/*.js -diff From e7b794b55bfc63a45d0fc9050837804a6c0c7609 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sun, 26 Feb 2017 23:47:11 +0100 Subject: [PATCH 145/272] Rename translation key --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 93326c01f..c8e60f031 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -229,7 +229,7 @@ core: restore_button: => core.ref.restore # These translations are used by the rename discussion modal. - rename_modal: + rename_discussion: title: Enter a new title for this discussion submit_button: Rename From cf82c045254882f96c33565beff236499c63fc21 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Tue, 28 Feb 2017 22:39:33 +0100 Subject: [PATCH 146/272] Fix nesting of rename_discussion translations Refs #98. --- extensions/lang-english/locale/core.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index c8e60f031..faa71ff03 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -228,11 +228,6 @@ core: reply_button: => core.ref.reply restore_button: => core.ref.restore - # These translations are used by the rename discussion modal. - rename_discussion: - title: Enter a new title for this discussion - submit_button: Rename - # These translations are used in the discussion list. discussion_list: empty_text: It looks like there are no discussions here. @@ -339,6 +334,11 @@ core: reply_placeholder: => core.ref.write_a_reply time_lapsed_text: "{period} later" + # These translations are used by the rename discussion modal. + rename_discussion: + title: Enter a new title for this discussion + submit_button: Rename + # These translations are used by the search results dropdown list. search: all_discussions_button: 'Search all discussions for "{query}"' From 35db9d7294e17726c3b057a27291070530f58ac5 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Thu, 2 Mar 2017 16:41:15 +0100 Subject: [PATCH 147/272] Add "Rename" to the reused translations Just because there are now two references of it. --- extensions/lang-english/locale/core.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index faa71ff03..df6f4cb50 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -224,7 +224,7 @@ core: delete_confirmation: "Are you sure you want to delete this discussion?" delete_forever_button: => core.ref.delete_forever log_in_to_reply_button: Log In to Reply - rename_button: Rename + rename_button: => core.ref.rename reply_button: => core.ref.reply restore_button: => core.ref.restore @@ -337,7 +337,7 @@ core: # These translations are used by the rename discussion modal. rename_discussion: title: Enter a new title for this discussion - submit_button: Rename + submit_button: => core.ref.rename # These translations are used by the search results dropdown list. search: @@ -521,6 +521,7 @@ core: notifications: Notifications okay: OK # Referenced by flarum-tags.yml password: Password + rename: Rename reply: Reply # Referenced by flarum-mentions.yml reset_your_password: Reset Your Password restore: Restore From ec5059221e2801bdde45ce3668922e2d01222320 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Sun, 5 Mar 2017 20:31:55 +0100 Subject: [PATCH 148/272] Update description of filled rule Source: https://github.com/laravel/laravel/commit/90886732cf6df6d8694287c3f9d92496a4f1c61b --- extensions/lang-english/locale/validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index c65e934a2..e4f73e2ea 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -26,7 +26,7 @@ validation: email: "The :attribute must be a valid email address." exists: "The selected :attribute is invalid." file: "The :attribute must be a file." - filled: "The :attribute field is required." + filled: "The :attribute field must have a value." image: "The :attribute must be an image." in: "The selected :attribute is invalid." in_array: "The :attribute field does not exist in :other." From 4cbb914cdc352122d99044bf221435455fdbc42e Mon Sep 17 00:00:00 2001 From: StoneSoldier Date: Wed, 10 May 2017 20:47:09 +0200 Subject: [PATCH 149/272] flagged_by text grammar fix (#103) * flagged_by text grammar fix changed "{username} flagged" to "Flagged by {username}" and "{username} flagged as {reason}" to "{username} flagged this as {reason}" * changed to "Flagged by {username} as {reason}" --- extensions/lang-english/locale/flarum-flags.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml index c1860d2c0..8a72528dd 100644 --- a/extensions/lang-english/locale/flarum-flags.yml +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -44,8 +44,8 @@ flarum-flags: # These translations are used by the frame displayed around flagged posts. post: dismiss_flag_button: Dismiss Flag - flagged_by_text: "{username} flagged" - flagged_by_with_reason_text: "{username} flagged as {reason}" + flagged_by_text: "Flagged by {username}" + flagged_by_with_reason_text: "Flagged by {username} as {reason}" # These translations are used by the post control buttons. post_controls: From 19ae5c0252d5b3e9300f93e7b838a011e60f11a2 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Thu, 18 May 2017 22:07:12 +0200 Subject: [PATCH 150/272] Add IPv4/IPv6 validation messages Source: https://github.com/laravel/laravel/commit/7e5739d266bba4624f933f547f111ee6ad26e095 --- extensions/lang-english/locale/validation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index e4f73e2ea..d839513b7 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -32,6 +32,8 @@ validation: in_array: "The :attribute field does not exist in :other." integer: "The :attribute must be an integer." ip: "The :attribute must be a valid IP address." + ipv4: "The :attribute must be a valid IPv4 address." + ipv6: "The :attribute must be a valid IPv6 address." json: "The :attribute must be a valid JSON string." max: numeric: "The :attribute may not be greater than :max." From 8a034a21c30d3a65c1a4636a94d86b6b34ad9637 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Thu, 18 May 2017 22:23:55 +0200 Subject: [PATCH 151/272] Optimize Union Jack SVG with SVGO The SVG now weighs 259 bytes only (27.45% saving). --- extensions/lang-english/icon.svg | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/extensions/lang-english/icon.svg b/extensions/lang-english/icon.svg index 097ef910c..147e73ee9 100644 --- a/extensions/lang-english/icon.svg +++ b/extensions/lang-english/icon.svg @@ -1,12 +1,10 @@ - - - - - - - - - - - + + + + + + + + + From 7f596572308a8f2d78c5049a90451962516878a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sevilla=20Mart=C3=ADn?= Date: Fri, 26 May 2017 19:15:23 -0400 Subject: [PATCH 152/272] Add view user list locale --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index df6f4cb50..8439e97e5 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -148,6 +148,7 @@ core: start_discussions_label: Start discussions view_discussions_label: View discussions view_post_ips_label: View post IP addresses + view_user_list_label: View User List # These translations are used in the dropdown menus on the Permissions page. permissions_controls: From 3945dbf760ddcdbe319abf015a8808952a667667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sevilla=20Mart=C3=ADn?= Date: Fri, 26 May 2017 20:45:35 -0400 Subject: [PATCH 153/272] Fix capitalization. Whoops! --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 8439e97e5..49a7ab1bf 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -148,7 +148,7 @@ core: start_discussions_label: Start discussions view_discussions_label: View discussions view_post_ips_label: View post IP addresses - view_user_list_label: View User List + view_user_list_label: View user list # These translations are used in the dropdown menus on the Permissions page. permissions_controls: From f33ee0dd43bec9401842489695b39cce7112e4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sevilla=20Mart=C3=ADn?= Date: Mon, 12 Jun 2017 09:20:27 -0400 Subject: [PATCH 154/272] Add `core.admin.basics.show_language_selector_label` --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 49a7ab1bf..15ecf6122 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -43,6 +43,7 @@ core: home_page_heading: Home Page home_page_text: "Choose the page which users will first see when they visit your forum. If entering a custom value, use the path relative to the forum root." saved_message: Your changes were saved. + show_language_selector_label: Show language selector submit_button: => core.ref.save_changes welcome_banner_heading: Welcome Banner welcome_banner_text: Configure the text that displays in the banner on the All Discussions page. Use this to welcome guests to your forum. From b158810233e55d6c9b7db7aacfc26355d1be31b6 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 8 Jul 2017 22:36:34 +0930 Subject: [PATCH 155/272] Update "Remember Me" checkbox label --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 15ecf6122..4ec6da73c 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -294,7 +294,7 @@ core: forgot_password_link: "Forgot password?" invalid_login_message: Your login details were incorrect. password_placeholder: => core.ref.password - remember_me_label: Remember me for two weeks + remember_me_label: Remember Me sign_up_text: "Don't have an account? Sign Up" submit_button: => core.ref.log_in title: => core.ref.log_in From 5daa273bd9a3bcb04b07eeaf0dd1b14b69a3461e Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 22 Jul 2017 10:27:27 +0930 Subject: [PATCH 156/272] Change rename discussion translation --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 4ec6da73c..46cf3e74d 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -338,7 +338,7 @@ core: # These translations are used by the rename discussion modal. rename_discussion: - title: Enter a new title for this discussion + title: Rename Discussion submit_button: => core.ref.rename # These translations are used by the search results dropdown list. From 73df696778ea1a698ee61baedbad5d1a0cf8bfb0 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 22 Jul 2017 10:35:50 +0930 Subject: [PATCH 157/272] v0.1.0-beta.7 --- extensions/lang-english/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index b38f86645..7ee2da161 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -5,7 +5,7 @@ "keywords": ["locale"], "license": "MIT", "require": { - "flarum/core": "^0.1.0-beta.6" + "flarum/core": "^0.1.0-beta.7" }, "extra": { "branch-alias": { From dca1a833ca5152f1f832891e4e30b5f1fff33801 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 22 Jul 2017 12:08:43 +0930 Subject: [PATCH 158/272] Add back button tooltip translation --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 46cf3e74d..1cde75fb9 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -265,6 +265,7 @@ core: # These translations are used in the header and session dropdown menu. header: admin_button: Administration + back_to_index_tooltip: Back to discussion list log_in_link: => core.ref.log_in log_out_button: => core.ref.log_out profile_button: Profile From 0ec346fbfbb19efc22c003d394e715400c6f996b Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Thu, 2 Nov 2017 00:27:53 +0100 Subject: [PATCH 159/272] Remove obsolete help text The custom path field has been removed a while ago. Refs flarum/core#1231. --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 1cde75fb9..860ee2234 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -41,7 +41,7 @@ core: forum_description_text: Enter a short sentence or two that describes your community. This will appear in the meta tag and show up in search engines. forum_title_heading: Forum Title home_page_heading: Home Page - home_page_text: "Choose the page which users will first see when they visit your forum. If entering a custom value, use the path relative to the forum root." + home_page_text: "Choose the page which users will first see when they visit your forum." saved_message: Your changes were saved. show_language_selector_label: Show language selector submit_button: => core.ref.save_changes From b36bf98d8a8734f89ae17c45c5486431cd450ed2 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Thu, 2 Nov 2017 01:01:35 +0100 Subject: [PATCH 160/272] Remove user bio placeholder Refs flarum/core#1214. --- extensions/lang-english/locale/core.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 860ee2234..0a51853af 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -377,7 +377,6 @@ core: avatar_remove_button: Remove avatar_upload_button: Upload avatar_upload_tooltip: Upload a new avatar - bio_placeholder: Write something about yourself discussions_link: => core.ref.discussions in_discussion_text: "In {discussion}" joined_date_text: "Joined {ago}" From f16ccc775c1f5d92a0377f7421fc2da45893fe6d Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Thu, 2 Nov 2017 23:33:14 +0100 Subject: [PATCH 161/272] Remove unnecessary double quotes Due to https://github.com/flarum/flarum-ext-english/commit/0ec346fbfbb19efc22c003d394e715400c6f996b (the comma was the special character which needed double quotes before its removal) --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 0a51853af..9fb2271b2 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -41,7 +41,7 @@ core: forum_description_text: Enter a short sentence or two that describes your community. This will appear in the meta tag and show up in search engines. forum_title_heading: Forum Title home_page_heading: Home Page - home_page_text: "Choose the page which users will first see when they visit your forum." + home_page_text: Choose the page which users will first see when they visit your forum. saved_message: Your changes were saved. show_language_selector_label: Show language selector submit_button: => core.ref.save_changes From 60f111ca87ad86b26b02ea8857ddd96d9dd9438c Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sun, 5 Nov 2017 16:28:00 +1030 Subject: [PATCH 162/272] Add translation for Preview tooltip --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 0a51853af..0b6342044 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -195,6 +195,7 @@ core: exit_full_screen_tooltip: Exit Full Screen full_screen_tooltip: Full Screen minimize_tooltip: Minimize + preview_tooltip: Preview # These translations are used by the composer when starting a discussion. composer_discussion: From 8c900dec01c2bfbb6fcb8470c7ca6aca4cdc44f4 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 29 Nov 2017 13:04:56 +1030 Subject: [PATCH 163/272] Update translations for reset password UI --- extensions/lang-english/locale/core.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index dd912338e..c22e08c01 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -448,10 +448,10 @@ core: next_page_button: => core.ref.next_page # Translations in this namespace are displayed by the Reset Password interface. - reset: - confirm_password_label: => core.ref.confirm_password - password_label: => core.ref.password - submit_button: Reset Password + reset_password: + confirm_password_label: Confirm New Password + new_password_label: New Password + submit_button: => core.ref.save_changes title: => core.ref.reset_your_password # Translations in this namespace are used in messages output by the API. From 4369ff350bc15ef931197ff5d81ae79f863230db Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 29 Nov 2017 13:05:10 +1030 Subject: [PATCH 164/272] Add translations for errors messages, log out confirmation --- extensions/lang-english/locale/core.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index c22e08c01..9651ccb39 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -442,11 +442,24 @@ core: next_page_button: => core.ref.next_page previous_page_button: Previous Page + # Translations in this namespace are displayed when Flarum encounters an error. + error: + 403_message: You do not have permission to access this page. + 404_message: The page you requested could not be found. + 500_message: An error occurred while trying to load this page. + 503_message: "{forum} is undergoing maintenance. Thanks for your patience!" + # Translations in this namespace are displayed by the basic HTML discussion index. index: all_discussions_heading: => core.ref.all_discussions next_page_button: => core.ref.next_page + # Translations in this namespace are displayed by the Log Out confirmation interface. + log_out: + log_out_button: => core.ref.log_out + log_out_confirmation: "Are you sure you want to log out of {forum}?" + title: => core.ref.log_out + # Translations in this namespace are displayed by the Reset Password interface. reset_password: confirm_password_label: Confirm New Password From e4d863842aa55b16116143c91b14c4e69f737cdf Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 29 Nov 2017 13:23:55 +1030 Subject: [PATCH 165/272] Add translation for 404 error return link --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 9651ccb39..ad796bff5 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -446,6 +446,7 @@ core: error: 403_message: You do not have permission to access this page. 404_message: The page you requested could not be found. + 404_return_link: "Return to {forum}" 500_message: An error occurred while trying to load this page. 503_message: "{forum} is undergoing maintenance. Thanks for your patience!" From a0587ec68ad299d68eb38fb7bb8055287bb7da3f Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 29 Nov 2017 17:22:17 +1030 Subject: [PATCH 166/272] Update translations for dashboard overhaul --- extensions/lang-english/locale/core.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index ad796bff5..580d97175 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -50,14 +50,7 @@ core: # These translations are used in the Dashboard page. dashboard: - beta_warning_text: "This beta software is provided primarily so that you can help us test it and make it better; it should not be used in production." - contributing_text: "Want to look for bugs and contribute? Read the Contributing docs." - extension_text: "Interested in developing extensions? Read the Extension docs." - features_text: "Got an idea to improve a feature? Tell us about it under the Features tag." - support_text: "Found a bug? Please report it in our forum, under the Support tag." - troubleshooting_text: "Having problems? Follow the instructions in the Troubleshooting docs." - version_text: "Thanks for trying out Flarum! You are running version {version}." - welcome_text: "Welcome to Flarum Beta!" + help_link: Get Help # These translations are used in the Edit Custom CSS modal dialog. edit_css: @@ -166,6 +159,16 @@ core: settings: submit_button: => core.ref.save_changes + # These translations are used in the Statistics dashboard widget. + statistics: + discussions_heading: Discussions + last_28_days_label: Last 28 days + last_7_days_label: Last 7 days + posts_heading: Posts + today_label: Today + total_label: Total + users_heading: Users + # These translations are used in image upload buttons. upload_image: remove_button: Remove From 65813f1dbdf87adb2cace7952bc0cb9adf1df629 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Wed, 29 Nov 2017 19:40:54 +0100 Subject: [PATCH 167/272] Use reused translation on the Statistics dashboard widget --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 580d97175..3def43b8d 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -161,7 +161,7 @@ core: # These translations are used in the Statistics dashboard widget. statistics: - discussions_heading: Discussions + discussions_heading: => core.ref.discussions last_28_days_label: Last 28 days last_7_days_label: Last 7 days posts_heading: Posts From f2075ec3bf4674bdacd490f1c9fc433ac0372781 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Wed, 29 Nov 2017 19:49:12 +0100 Subject: [PATCH 168/272] Create core.ref.posts reused translation to replace multiple occurences --- extensions/lang-english/locale/core.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 580d97175..08bb1d1fb 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -164,7 +164,7 @@ core: discussions_heading: Discussions last_28_days_label: Last 28 days last_7_days_label: Last 7 days - posts_heading: Posts + posts_heading: => core.ref.posts today_label: Today total_label: Total users_heading: Users @@ -386,7 +386,7 @@ core: joined_date_text: "Joined {ago}" online_text: Online posts_load_more_button: => core.ref.load_more - posts_link: Posts + posts_link: => core.ref.posts settings_link: => core.ref.settings # These translations are found on the user profile page (admin function). @@ -541,6 +541,7 @@ core: notifications: Notifications okay: OK # Referenced by flarum-tags.yml password: Password + posts: Posts rename: Rename reply: Reply # Referenced by flarum-mentions.yml reset_your_password: Reset Your Password From e674b0181b16f8f342242744eefd7fa34d8f571b Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sun, 10 Dec 2017 21:05:01 +1030 Subject: [PATCH 169/272] Extract admin dashboard statistics from core into an extension --- extensions/lang-english/locale/core.yml | 14 ++------------ .../lang-english/locale/flarum-statistics.yml | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 extensions/lang-english/locale/flarum-statistics.yml diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 26f26d235..6da07a7a2 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -159,16 +159,6 @@ core: settings: submit_button: => core.ref.save_changes - # These translations are used in the Statistics dashboard widget. - statistics: - discussions_heading: => core.ref.discussions - last_28_days_label: Last 28 days - last_7_days_label: Last 7 days - posts_heading: => core.ref.posts - today_label: Today - total_label: Total - users_heading: Users - # These translations are used in image upload buttons. upload_image: remove_button: Remove @@ -530,7 +520,7 @@ core: confirmation_email_sent: "We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." delete: Delete delete_forever: Delete Forever - discussions: Discussions + discussions: Discussions # Referenced by flarum-statistics.yml edit: Edit email: Email load_more: Load More @@ -541,7 +531,7 @@ core: notifications: Notifications okay: OK # Referenced by flarum-tags.yml password: Password - posts: Posts + posts: Posts # Referenced by flarum-statistics.yml rename: Rename reply: Reply # Referenced by flarum-mentions.yml reset_your_password: Reset Your Password diff --git a/extensions/lang-english/locale/flarum-statistics.yml b/extensions/lang-english/locale/flarum-statistics.yml new file mode 100644 index 000000000..68a64fcad --- /dev/null +++ b/extensions/lang-english/locale/flarum-statistics.yml @@ -0,0 +1,19 @@ +flarum-statistics: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Translations in this namespace are used by the admin interface. + admin: + + # These translations are used in the Statistics dashboard widget. + statistics: + discussions_heading: => core.ref.discussions + last_12_months_label: Last 12 months + last_28_days_label: Last 28 days + last_7_days_label: Last 7 days + posts_heading: => core.ref.posts + today_label: Today + total_label: Total + users_heading: Users From 862cbff8958579e4f55595eb4998e76ec05b222d Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Wed, 3 Jan 2018 22:36:32 +0100 Subject: [PATCH 170/272] Try to improve load error message Necessary until refreshing assets works better... Closes #112. --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 6da07a7a2..274058f8d 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -427,7 +427,7 @@ core: # Translations in this namespace are displayed by the basic HTML content loader. content: javascript_disabled_message: This site is best viewed in a modern browser with JavaScript enabled. - load_error_message: Something went wrong while trying to load the full version of this site. + load_error_message: Something went wrong while trying to load the full version of this site. Try hard-refreshing this page to fix the error. loading_text: Loading... # Translations in this namespace are displayed in the basic HTML discussion view. From b65c8a278a80058bab13899b15d1c3cf42da3999 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 5 Jan 2018 12:17:16 +1030 Subject: [PATCH 171/272] Add translation for statistics active users count --- extensions/lang-english/locale/flarum-statistics.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/flarum-statistics.yml b/extensions/lang-english/locale/flarum-statistics.yml index 68a64fcad..52d76901d 100644 --- a/extensions/lang-english/locale/flarum-statistics.yml +++ b/extensions/lang-english/locale/flarum-statistics.yml @@ -9,6 +9,7 @@ flarum-statistics: # These translations are used in the Statistics dashboard widget. statistics: + active_users_text: "{count} active" discussions_heading: => core.ref.discussions last_12_months_label: Last 12 months last_28_days_label: Last 28 days From ebbcdac1f7cc7b591f8e6012b7953690b65edaa5 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Tue, 2 Jan 2018 22:00:47 +0100 Subject: [PATCH 172/272] Use new extenders for bootstrapping --- extensions/lang-english/bootstrap.php | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/extensions/lang-english/bootstrap.php b/extensions/lang-english/bootstrap.php index a941063c8..c8586cb9e 100644 --- a/extensions/lang-english/bootstrap.php +++ b/extensions/lang-english/bootstrap.php @@ -1,10 +1,16 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ -return function (Dispatcher $events) { - $events->listen(ConfigureLocales::class, function (ConfigureLocales $event) { - $event->loadLanguagePackFrom(__DIR__); - }); -}; +use Flarum\Extend; + +return [ + new Extend\Locale(__DIR__) +]; From 80132f086c3b3279cad23e540afd72e290a55a83 Mon Sep 17 00:00:00 2001 From: AFR Date: Mon, 8 Jan 2018 00:33:23 +0700 Subject: [PATCH 173/272] Custom Footer HTML Translations (#113) * Custom Footer HTML Translations * Reorder translation group alphabetically --- extensions/lang-english/locale/core.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 274058f8d..87ce9b725 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -19,12 +19,15 @@ core: colored_header_label: Colored Header colors_heading: Colors colors_text: "Choose two colors to theme your forum with. The first will be used as a highlight color, while the second will be used to style background elements." + custom_footer_heading: Custom Footer + custom_footer_text: "Add HTML to be displayed at the very bottom of the page." custom_header_heading: Custom Header custom_header_text: "Add HTML to be displayed at the very top of the page, above Flarum's own header." custom_styles_heading: Custom Styles custom_styles_text: Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles. dark_mode_label: Dark Mode edit_css_button: Edit Custom CSS + edit_footer_button: Edit Custom Footer edit_header_button: Edit Custom Header enter_hex_message: Please enter a hexadecimal color code. favicon_heading: Favicon @@ -58,6 +61,12 @@ core: submit_button: => core.ref.save_changes title: Edit Custom CSS + # These translations are used in the Edit Custom Footer modal dialog. + edit_footer: + customize_text: "Add HTML to be displayed at the very bottom of the page." + submit_button: => core.ref.save_changes + title: Edit Custom Footer + # These translations are used in the Edit Group modal dialog. edit_group: color_label: Color From 31bc5effe3b3920b4ded17fdf9d77abb954011f7 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Wed, 10 Jan 2018 20:41:43 +0100 Subject: [PATCH 174/272] Translate new "Previous page" button on discussion list --- extensions/lang-english/locale/core.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 87ce9b725..743b04b27 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -442,7 +442,7 @@ core: # Translations in this namespace are displayed in the basic HTML discussion view. discussion: next_page_button: => core.ref.next_page - previous_page_button: Previous Page + previous_page_button: => core.ref.previous_page # Translations in this namespace are displayed when Flarum encounters an error. error: @@ -456,6 +456,7 @@ core: index: all_discussions_heading: => core.ref.all_discussions next_page_button: => core.ref.next_page + previous_page_button: => core.ref.previous_page # Translations in this namespace are displayed by the Log Out confirmation interface. log_out: @@ -541,6 +542,7 @@ core: okay: OK # Referenced by flarum-tags.yml password: Password posts: Posts # Referenced by flarum-statistics.yml + previous_page: Previous Page rename: Rename reply: Reply # Referenced by flarum-mentions.yml reset_your_password: Reset Your Password From 1f849a0c895249714fbb7a254db02dfb7da957f7 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 11 Jan 2018 12:25:07 +1030 Subject: [PATCH 175/272] Require beta 8 --- extensions/lang-english/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 7ee2da161..6406e39ff 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -5,7 +5,7 @@ "keywords": ["locale"], "license": "MIT", "require": { - "flarum/core": "^0.1.0-beta.7" + "flarum/core": "^0.1.0-beta.8" }, "extra": { "branch-alias": { From df551b4848b8ad14e8e76feddedcc9e4cb3e91c8 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Mon, 15 Jan 2018 19:35:00 +0100 Subject: [PATCH 176/272] Update license year range to 2018 --- extensions/lang-english/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/LICENSE b/extensions/lang-english/LICENSE index ef81bf33a..57b3de07f 100644 --- a/extensions/lang-english/LICENSE +++ b/extensions/lang-english/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2017 Toby Zerner +Copyright (c) 2015-2018 Toby Zerner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 71ecb164c87aeecc7e56dbc3a98f4258414d8478 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Wed, 14 Feb 2018 08:14:54 +0100 Subject: [PATCH 177/272] Use reused translations and remove unnecessary double quotes (#115) * Use reused translations and remove unnecessary double quotes * Additional use of reused translations --- extensions/lang-english/locale/core.yml | 31 ++++++++++++------- .../lang-english/locale/flarum-statistics.yml | 2 +- .../lang-english/locale/flarum-tags.yml | 2 +- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 743b04b27..6ded04dd1 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -20,15 +20,15 @@ core: colors_heading: Colors colors_text: "Choose two colors to theme your forum with. The first will be used as a highlight color, while the second will be used to style background elements." custom_footer_heading: Custom Footer - custom_footer_text: "Add HTML to be displayed at the very bottom of the page." + custom_footer_text: => core.ref.custom_footer_text custom_header_heading: Custom Header - custom_header_text: "Add HTML to be displayed at the very top of the page, above Flarum's own header." + custom_header_text: => core.ref.custom_header_text custom_styles_heading: Custom Styles custom_styles_text: Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles. dark_mode_label: Dark Mode edit_css_button: Edit Custom CSS - edit_footer_button: Edit Custom Footer - edit_header_button: Edit Custom Header + edit_footer_button: => core.ref.custom_footer_title + edit_header_button: => core.ref.custom_header_title enter_hex_message: Please enter a hexadecimal color code. favicon_heading: Favicon favicon_text: Upload an image to be displayed as the forum's shortcut icon. @@ -63,13 +63,13 @@ core: # These translations are used in the Edit Custom Footer modal dialog. edit_footer: - customize_text: "Add HTML to be displayed at the very bottom of the page." + customize_text: => core.ref.custom_footer_text submit_button: => core.ref.save_changes - title: Edit Custom Footer + title: => core.ref.custom_footer_title # These translations are used in the Edit Group modal dialog. edit_group: - color_label: Color + color_label: => core.ref.color delete_button: Delete Group delete_confirmation: "Are you sure you want to delete this group? The group members will NOT be deleted." icon_label: Icon @@ -82,9 +82,9 @@ core: # These translations are used in the Edit Custom Header modal dialog. edit_header: - customize_text: "Add HTML to be displayed at the very top of the page, above Flarum's own header." + customize_text: => core.ref.custom_header_text submit_button: => core.ref.save_changes - title: Edit Custom Header + title: => core.ref.custom_header_title # These translations are used in the email page of the admin interface. email: @@ -170,7 +170,7 @@ core: # These translations are used in image upload buttons. upload_image: - remove_button: Remove + remove_button: => core.ref.remove upload_button: Choose an Image... # Translations in this namespace are used by the forum user interface. @@ -349,7 +349,7 @@ core: search: all_discussions_button: 'Search all discussions for "{query}"' discussions_heading: => core.ref.discussions - users_heading: Users + users_heading: => core.ref.users # These translations are used in the Settings page. settings: @@ -377,7 +377,7 @@ core: # These translations are used in the user profile page and profile popup. user: - avatar_remove_button: Remove + avatar_remove_button: => core.ref.remove avatar_upload_button: Upload avatar_upload_tooltip: Upload a new avatar discussions_link: => core.ref.discussions @@ -526,8 +526,13 @@ core: all_discussions: All Discussions change_email: Change Email change_password: Change Password + color: Color # Referenced by flarum-tags.yml confirm_password: Confirm Password confirmation_email_sent: "We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." + custom_footer_text: Add HTML to be displayed at the very bottom of the page. + custom_footer_title: Edit Custom Footer + custom_header_text: "Add HTML to be displayed at the very top of the page, above Flarum's own header." + custom_header_title: Edit Custom Header delete: Delete delete_forever: Delete Forever discussions: Discussions # Referenced by flarum-statistics.yml @@ -542,6 +547,7 @@ core: okay: OK # Referenced by flarum-tags.yml password: Password posts: Posts # Referenced by flarum-statistics.yml + remove: Remove previous_page: Previous Page rename: Rename reply: Reply # Referenced by flarum-mentions.yml @@ -553,6 +559,7 @@ core: some_others: "{count} other|{count} others" # Referenced by flarum-likes.yml, flarum-mentions.yml start_a_discussion: Start a Discussion username: Username + users: Users # Referenced by flarum-statistics.yml write_a_reply: Write a Reply... you: You # Referenced by flarum-likes.yml, flarum-mentions.yml diff --git a/extensions/lang-english/locale/flarum-statistics.yml b/extensions/lang-english/locale/flarum-statistics.yml index 52d76901d..4cadaf7ac 100644 --- a/extensions/lang-english/locale/flarum-statistics.yml +++ b/extensions/lang-english/locale/flarum-statistics.yml @@ -17,4 +17,4 @@ flarum-statistics: posts_heading: => core.ref.posts today_label: Today total_label: Total - users_heading: Users + users_heading: => core.ref.users diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index d21809ca7..f389e5c7b 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -13,7 +13,7 @@ flarum-tags: # These translations are used in the Edit Tag modal dialog. edit_tag: - color_label: Color + color_label: => core.ref.color delete_tag_button: Delete Tag delete_tag_confirmation: "Are you sure you want to delete this tag? The tag's discussions will NOT be deleted." description_label: Description From 0b218489f0a0ae97a2e1d2425d9ea9b58e415ce4 Mon Sep 17 00:00:00 2001 From: fvlasie <33334298+fvlasie@users.noreply.github.com> Date: Sat, 3 Mar 2018 19:11:12 -0800 Subject: [PATCH 178/272] Improved style of ENglish --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 6ded04dd1..c331bdda1 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -235,7 +235,7 @@ core: # These translations are used in the discussion list. discussion_list: - empty_text: It looks like there are no discussions here. + empty_text: It looks as though there are no discussions here. load_more_button: => core.ref.load_more mark_as_read_tooltip: Mark as Read replied_text: "{username} replied {ago}" From 5057f05194d83ce2b7f3b76753b9371f7c43b9b6 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Mon, 19 Mar 2018 01:08:43 +0100 Subject: [PATCH 179/272] Use new extender name --- extensions/lang-english/bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/bootstrap.php b/extensions/lang-english/bootstrap.php index c8586cb9e..bbfd42ffa 100644 --- a/extensions/lang-english/bootstrap.php +++ b/extensions/lang-english/bootstrap.php @@ -12,5 +12,5 @@ use Flarum\Extend; return [ - new Extend\Locale(__DIR__) + new Extend\LanguagePack ]; From 16689cbac711d2b93bcdb88063296207b56df31c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Sun, 13 May 2018 22:03:37 +0200 Subject: [PATCH 180/272] Update core.yml now that we need the full icon class, the groups icon text has to be updated too --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 6ded04dd1..42b4346e2 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -73,7 +73,7 @@ core: delete_button: Delete Group delete_confirmation: "Are you sure you want to delete this group? The group members will NOT be deleted." icon_label: Icon - icon_text: "Enter the name of any FontAwesome icon class, without the fa- prefix." + icon_text: "Enter the name of any FontAwesome icon class, including the fas fa- prefix." name_label: Name plural_placeholder: Plural (e.g. Mods) singular_placeholder: Singular (e.g. Mod) From 843432a3929dec09081fcfd8fdfde217d8007127 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Wed, 16 May 2018 21:45:27 +0200 Subject: [PATCH 181/272] Update to the latest Laravel version (#122) Add message for "Not Regex" validation rule (https://github.com/laravel/laravel/commit/293fae6bd8285d076cedf2b8147a20e4090aa5bc#diff-9c04f727a922ad4f105b9ad764ec221d) and add language lines for the newly added comparison validation rules (https://github.com/laravel/laravel/commit/51507a6d8aef31fadac8125663f83f3302405a72#diff-9c04f727a922ad4f105b9ad764ec221d and https://github.com/laravel/laravel/commit/7d8e91ab66d0e8cba4e24394f6340109fbce024e#diff-9c04f727a922ad4f105b9ad764ec221d). --- extensions/lang-english/locale/validation.yml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index d839513b7..f8cbe88c0 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -27,6 +27,16 @@ validation: exists: "The selected :attribute is invalid." file: "The :attribute must be a file." filled: "The :attribute field must have a value." + gt: + numeric: "The :attribute must be greater than :value." + file: "The :attribute must be greater than :value kilobytes." + string: "The :attribute must be greater than :value characters." + array: "The :attribute must have more than :value items." + gte: + numeric: "The :attribute must be greater than or equal :value." + file: "The :attribute must be greater than or equal :value kilobytes." + string: "The :attribute must be greater than or equal :value characters." + array: "The :attribute must have :value items or more." image: "The :attribute must be an image." in: "The selected :attribute is invalid." in_array: "The :attribute field does not exist in :other." @@ -35,6 +45,16 @@ validation: ipv4: "The :attribute must be a valid IPv4 address." ipv6: "The :attribute must be a valid IPv6 address." json: "The :attribute must be a valid JSON string." + lt: + numeric: "The :attribute must be less than :value." + file: "The :attribute must be less than :value kilobytes." + string: "The :attribute must be less than :value characters." + array: "The :attribute must have less than :value items." + lte: + numeric: "The :attribute must be less than or equal :value." + file: "The :attribute must be less than or equal :value kilobytes." + string: "The :attribute must be less than or equal :value characters." + array: "The :attribute must not have more than :value items." max: numeric: "The :attribute may not be greater than :max." file: "The :attribute may not be greater than :max kilobytes." @@ -48,6 +68,7 @@ validation: string: "The :attribute must be at least :min characters." array: "The :attribute must have at least :min items." not_in: "The selected :attribute is invalid." + not_regex: "The :attribute format is invalid." numeric: "The :attribute must be a number." present: "The :attribute field must be present." regex: "The :attribute format is invalid." From a8274a58211f2e46751836ed1c07cdd75637188e Mon Sep 17 00:00:00 2001 From: Clark Winkelmann Date: Thu, 24 May 2018 18:51:31 +0200 Subject: [PATCH 182/272] Use more consistent capitalization for back tooltip --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 42b4346e2..4c511f1b5 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -268,7 +268,7 @@ core: # These translations are used in the header and session dropdown menu. header: admin_button: Administration - back_to_index_tooltip: Back to discussion list + back_to_index_tooltip: Back to Discussion List log_in_link: => core.ref.log_in log_out_button: => core.ref.log_out profile_button: Profile From b0876604ac54e4546dd2113038c57f2705f69c27 Mon Sep 17 00:00:00 2001 From: Clark Winkelmann Date: Thu, 24 May 2018 18:51:50 +0200 Subject: [PATCH 183/272] Add tags page back button tooltip translation --- extensions/lang-english/locale/flarum-tags.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index f389e5c7b..38a519b6f 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -71,6 +71,9 @@ flarum-tags: discussion_controls: edit_tags_button: Edit Tags + header: + back_to_tags_tooltip: Back to Tag List + # These translations are used on the index page, peripheral to the discussion list. index: more_link: More... From bca3810496d2ef607601f667ba4b2e59f4076282 Mon Sep 17 00:00:00 2001 From: Sajjad Hashemian Date: Wed, 30 May 2018 09:18:04 +0430 Subject: [PATCH 184/272] add yamllinter check (#124) * add yamllinter check * ignore validation.yml * enhancement * cleanup --- extensions/lang-english/.travis.yml | 7 +++++ extensions/lang-english/scripts/linter.sh | 32 +++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 extensions/lang-english/.travis.yml create mode 100644 extensions/lang-english/scripts/linter.sh diff --git a/extensions/lang-english/.travis.yml b/extensions/lang-english/.travis.yml new file mode 100644 index 000000000..0a31f773b --- /dev/null +++ b/extensions/lang-english/.travis.yml @@ -0,0 +1,7 @@ +language: bash + +before_script: + - go get github.com/sijad/yaml-translation-utils/yamllinter + +script: + - bash scripts/linter.sh diff --git a/extensions/lang-english/scripts/linter.sh b/extensions/lang-english/scripts/linter.sh new file mode 100644 index 000000000..45f37f974 --- /dev/null +++ b/extensions/lang-english/scripts/linter.sh @@ -0,0 +1,32 @@ +if ! [ -x "$(command -v yamllinter)" ]; then + echo 'Error: yamllinter is not installed.' >&2 + exit 1 +fi + +GREEN='\033[0;32m' +RED='\033[0;31m' +NC='\033[0m' + +cd "./locale" + +RC=0 + +for r in *.yml +do + [ "$r" != "validation.yml" ] || continue + + echo "Checking $r:" + + yamllinter --file "$r" --level 2 + + if [ $? -eq 1 ]; then + RC=1 + printf "${RED}⨉ faild${NC}\n" + else + printf "${GREEN}✓ passed${NC}\n" + fi + + echo +done + +exit $RC From dcef34bafab875eb4d09806c71b2c6142c05058b Mon Sep 17 00:00:00 2001 From: Sajjad Hashemian Date: Sat, 16 Jun 2018 09:08:20 +0430 Subject: [PATCH 185/272] [WIP] sort keys (#125) * sort core.yml * sort flarum-suspend.yml * sort flarum-tags.yml * undo email subjects --- extensions/lang-english/locale/core.yml | 20 +++++++++---------- .../lang-english/locale/flarum-suspend.yml | 2 +- .../lang-english/locale/flarum-tags.yml | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 4c511f1b5..0d9c31bc0 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -133,8 +133,8 @@ core: # These translations are used in the Permissions page of the admin interface. permissions: - allow_renaming_label: Allow renaming allow_post_editing_label: Allow post editing + allow_renaming_label: Allow renaming create_heading: Create delete_discussions_forever_label: Delete discussions forever delete_discussions_label: Delete discussions @@ -178,8 +178,8 @@ core: # These translations are used in the Change Email modal dialog. change_email: - confirmation_message: => core.ref.confirmation_email_sent confirm_password_placeholder: => core.ref.confirm_password + confirmation_message: => core.ref.confirmation_email_sent dismiss_button: => core.ref.okay incorrect_password_message: The password you entered is incorrect. submit_button: => core.ref.save_changes @@ -342,8 +342,8 @@ core: # These translations are used by the rename discussion modal. rename_discussion: - title: Rename Discussion submit_button: => core.ref.rename + title: Rename Discussion # These translations are used by the search results dropdown list. search: @@ -366,8 +366,8 @@ core: # These translations are used in the Sign Up modal dialog. sign_up: - email_placeholder: => core.ref.email dismiss_button: => core.ref.okay + email_placeholder: => core.ref.email log_in_text: "Already have an account? Log In" password_placeholder: => core.ref.password submit_button: => core.ref.sign_up @@ -384,8 +384,8 @@ core: in_discussion_text: "In {discussion}" joined_date_text: "Joined {ago}" online_text: Online - posts_load_more_button: => core.ref.load_more posts_link: => core.ref.posts + posts_load_more_button: => core.ref.load_more settings_link: => core.ref.settings # These translations are found on the user profile page (admin function). @@ -408,10 +408,6 @@ core: badge: hidden_tooltip: Hidden - # These translations are used to modify usernames. - username: - deleted_text: "[deleted]" - # These translations are displayed as error messages. error: generic_message: "Oops! Something went wrong. Please reload the page and try again." @@ -430,6 +426,10 @@ core: three_text: "{first}, {second}, and {third}" two_text: "{first} and {second}" + # These translations are used to modify usernames. + username: + deleted_text: "[deleted]" + # Translations in this namespace are used in views other than Flarum's normal JS client. views: @@ -547,8 +547,8 @@ core: okay: OK # Referenced by flarum-tags.yml password: Password posts: Posts # Referenced by flarum-statistics.yml - remove: Remove previous_page: Previous Page + remove: Remove rename: Rename reply: Reply # Referenced by flarum-mentions.yml reset_your_password: Reset Your Password diff --git a/extensions/lang-english/locale/flarum-suspend.yml b/extensions/lang-english/locale/flarum-suspend.yml index f2ebed91f..7eef17f03 100644 --- a/extensions/lang-english/locale/flarum-suspend.yml +++ b/extensions/lang-english/locale/flarum-suspend.yml @@ -17,8 +17,8 @@ flarum-suspend: # These translations are used in the Suspend User modal dialog (admin function). suspend_user: indefinitely_label: Suspended indefinitely - limited_time_label: Suspended for a limited time... limited_time_days_text: " days" + limited_time_label: Suspended for a limited time... not_suspended_label: Not suspended status_heading: Suspension Status submit_button: => core.ref.save_changes diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index 38a519b6f..94993b293 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -82,8 +82,8 @@ flarum-tags: # These translations are displayed between posts in the post stream. post_stream: - added_tags_text: "{username} added the {tagsAdded}." added_and_removed_tags_text: "{username} added the {tagsAdded} and removed the {tagsRemoved}." + added_tags_text: "{username} added the {tagsAdded}." removed_tags_text: "{username} removed the {tagsRemoved}." tags_text: "{tags} tag|{tags} tags" From dfaf0eb0f3168ebb882b89c6974d077ded74307c Mon Sep 17 00:00:00 2001 From: Sajjad Hashemian Date: Sat, 16 Jun 2018 09:09:10 +0430 Subject: [PATCH 186/272] Revert "add yamllinter check (#124)" (#127) This reverts commit bca3810496d2ef607601f667ba4b2e59f4076282. --- extensions/lang-english/.travis.yml | 7 ----- extensions/lang-english/scripts/linter.sh | 32 ----------------------- 2 files changed, 39 deletions(-) delete mode 100644 extensions/lang-english/.travis.yml delete mode 100644 extensions/lang-english/scripts/linter.sh diff --git a/extensions/lang-english/.travis.yml b/extensions/lang-english/.travis.yml deleted file mode 100644 index 0a31f773b..000000000 --- a/extensions/lang-english/.travis.yml +++ /dev/null @@ -1,7 +0,0 @@ -language: bash - -before_script: - - go get github.com/sijad/yaml-translation-utils/yamllinter - -script: - - bash scripts/linter.sh diff --git a/extensions/lang-english/scripts/linter.sh b/extensions/lang-english/scripts/linter.sh deleted file mode 100644 index 45f37f974..000000000 --- a/extensions/lang-english/scripts/linter.sh +++ /dev/null @@ -1,32 +0,0 @@ -if ! [ -x "$(command -v yamllinter)" ]; then - echo 'Error: yamllinter is not installed.' >&2 - exit 1 -fi - -GREEN='\033[0;32m' -RED='\033[0;31m' -NC='\033[0m' - -cd "./locale" - -RC=0 - -for r in *.yml -do - [ "$r" != "validation.yml" ] || continue - - echo "Checking $r:" - - yamllinter --file "$r" --level 2 - - if [ $? -eq 1 ]; then - RC=1 - printf "${RED}⨉ faild${NC}\n" - else - printf "${GREEN}✓ passed${NC}\n" - fi - - echo -done - -exit $RC From 4c2fc9d41483e52415210945a6b1005615d3298d Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 22 Jun 2018 19:19:23 +0930 Subject: [PATCH 187/272] Simplify the bootstrap file (#128) --- extensions/lang-english/bootstrap.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/extensions/lang-english/bootstrap.php b/extensions/lang-english/bootstrap.php index bbfd42ffa..7b40e0bb3 100644 --- a/extensions/lang-english/bootstrap.php +++ b/extensions/lang-english/bootstrap.php @@ -9,8 +9,4 @@ * file that was distributed with this source code. */ -use Flarum\Extend; - -return [ - new Extend\LanguagePack -]; +return new Flarum\Extend\LanguagePack; From 8d3e10ce5e95256bf25ccf3afe7b0ac56362abf6 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Sat, 23 Jun 2018 14:08:25 +0200 Subject: [PATCH 188/272] Fix alpha_dash (#130) Fix from https://github.com/laravel/laravel/commit/7ff917aa203b2f0869761c99283d18b6a2eb6cf8#diff-9c04f727a922ad4f105b9ad764ec221d --- extensions/lang-english/locale/validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index f8cbe88c0..4e0248592 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -4,7 +4,7 @@ validation: after: "The :attribute must be a date after :date." after_or_equal: "The :attribute must be a date after or equal to :date." alpha: "The :attribute may only contain letters." - alpha_dash: "The :attribute may only contain letters, numbers, and dashes." + alpha_dash: "The :attribute may only contain letters, numbers, dashes and underscores." alpha_num: "The :attribute may only contain letters and numbers." array: "The :attribute must be an array." before: "The :attribute must be a date before :date." From 45761e5651ca67dc4ba492ad0c80bd21f854e00d Mon Sep 17 00:00:00 2001 From: AFR Date: Mon, 25 Jun 2018 04:49:35 +0700 Subject: [PATCH 189/272] Separate edit and delete posts translation (#129) --- extensions/lang-english/locale/core.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 0d9c31bc0..956d2a79e 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -139,7 +139,8 @@ core: delete_discussions_forever_label: Delete discussions forever delete_discussions_label: Delete discussions delete_posts_forever_label: Delete posts forever - edit_and_delete_posts_label: Edit and delete posts + delete_posts_label: Delete posts + edit_posts_label: Edit posts global_heading: Global moderate_heading: Moderate new_group_button: New Group From 85c0a23dc2a60deb7872cc713b21fd02a4bda436 Mon Sep 17 00:00:00 2001 From: David Sevilla Date: Fri, 20 Jul 2018 10:31:40 -0400 Subject: [PATCH 190/272] Add translations for suspend notifications --- extensions/lang-english/locale/flarum-suspend.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/lang-english/locale/flarum-suspend.yml b/extensions/lang-english/locale/flarum-suspend.yml index 7eef17f03..55ae520b8 100644 --- a/extensions/lang-english/locale/flarum-suspend.yml +++ b/extensions/lang-english/locale/flarum-suspend.yml @@ -13,6 +13,10 @@ flarum-suspend: # Translations in this namespace are used by the forum user interface. forum: + # These translations are used in the suspension notifications + notifications: + user_suspended_text: "{username} suspended you for {timeReadable}" + user_unsuspended_text: "{username} unsuspended you" # These translations are used in the Suspend User modal dialog (admin function). suspend_user: From 2931dc4b521e1c58a66b1cdf0bf00426cdb46bc7 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 21 Sep 2018 11:44:32 +0930 Subject: [PATCH 191/272] Rename bootstrap.php --- extensions/lang-english/{bootstrap.php => extend.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename extensions/lang-english/{bootstrap.php => extend.php} (100%) diff --git a/extensions/lang-english/bootstrap.php b/extensions/lang-english/extend.php similarity index 100% rename from extensions/lang-english/bootstrap.php rename to extensions/lang-english/extend.php From 9e3a54d8ba07cc46b42cd58b779f47bd7aa1f399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sevilla=20Mart=C3=ADn?= Date: Sat, 22 Sep 2018 17:12:50 -0400 Subject: [PATCH 192/272] Add `core.forum.user.posts_empty_text` --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 956d2a79e..ef128db22 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -385,6 +385,7 @@ core: in_discussion_text: "In {discussion}" joined_date_text: "Joined {ago}" online_text: Online + posts_empty_text: It looks like there are no posts here. posts_link: => core.ref.posts posts_load_more_button: => core.ref.load_more settings_link: => core.ref.settings From 515cc3f42fa32c114022c43cedf6a286ab843011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sevilla=20Mart=C3=ADn?= Date: Sat, 22 Sep 2018 17:56:21 -0400 Subject: [PATCH 193/272] Add view user last seen at label (#132) * Add view user last seen at label * Update core.yml --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index ef128db22..7b533cdd7 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -153,6 +153,7 @@ core: view_discussions_label: View discussions view_post_ips_label: View post IP addresses view_user_list_label: View user list + view_last_seen_at_label: View user last seen time # These translations are used in the dropdown menus on the Permissions page. permissions_controls: From a4a341c929522563d7f35fea372ad78ef5048d89 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Sun, 23 Sep 2018 16:27:27 +0200 Subject: [PATCH 194/272] Fix translation sorting (#134) --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 7b533cdd7..d6eaeaa05 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -151,9 +151,9 @@ core: sign_up_label: Sign up start_discussions_label: Start discussions view_discussions_label: View discussions + view_last_seen_at_label: View user last seen time view_post_ips_label: View post IP addresses view_user_list_label: View user list - view_last_seen_at_label: View user last seen time # These translations are used in the dropdown menus on the Permissions page. permissions_controls: From 9e1bc4e801078d98b811c0bc39f0c715dd6c635b Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Tue, 2 Oct 2018 19:56:14 +0200 Subject: [PATCH 195/272] Changes the translation for "required_with_all" validation rule See: https://github.com/laravel/laravel/commit/4b589c1a4a5ec04838408875fc3bd233dbcf5904#diff-9c04f727a922ad4f105b9ad764ec221d --- extensions/lang-english/locale/validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index 4e0248592..5a96c46c9 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -76,7 +76,7 @@ validation: required_if: "The :attribute field is required when :other is :value." required_unless: "The :attribute field is required unless :other is in :values." required_with: "The :attribute field is required when :values is present." - required_with_all: "The :attribute field is required when :values is present." + required_with_all: "The :attribute field is required when :values are present." required_without: "The :attribute field is required when :values is not present." required_without_all: "The :attribute field is required when none of :values are present." same: "The :attribute and :other must match." From ab61b676a613c76d15e842095fd2e625bc2456de Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 17 Oct 2018 13:44:47 +1030 Subject: [PATCH 196/272] Rename package --- extensions/lang-english/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 6406e39ff..dab62d602 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -1,5 +1,5 @@ { - "name": "flarum/flarum-ext-english", + "name": "flarum/lang-english", "type": "flarum-extension", "description": "English language pack.", "keywords": ["locale"], From 3a23b561c9cea7a9c539e7fe76cac1893c0df5c0 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 12 Nov 2018 17:34:06 +1030 Subject: [PATCH 197/272] Add new emoji translations --- extensions/lang-english/locale/flarum-emoji.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 extensions/lang-english/locale/flarum-emoji.yml diff --git a/extensions/lang-english/locale/flarum-emoji.yml b/extensions/lang-english/locale/flarum-emoji.yml new file mode 100644 index 000000000..a7d29de51 --- /dev/null +++ b/extensions/lang-english/locale/flarum-emoji.yml @@ -0,0 +1,13 @@ +flarum-emoji: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Translations in this namespace are used by the forum user interface. + forum: + + # These translations are used by the composer (emoji autocompletion function). + composer: + emoji_tooltip: Insert emoji + type_to_search_text: Type to search for an emoji From b260ad4a190d2086cf59f017fc3e603e49467c9f Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 12 Nov 2018 17:35:20 +1030 Subject: [PATCH 198/272] Add new markdown button translations --- .../lang-english/locale/flarum-markdown.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 extensions/lang-english/locale/flarum-markdown.yml diff --git a/extensions/lang-english/locale/flarum-markdown.yml b/extensions/lang-english/locale/flarum-markdown.yml new file mode 100644 index 000000000..dd1161734 --- /dev/null +++ b/extensions/lang-english/locale/flarum-markdown.yml @@ -0,0 +1,19 @@ +flarum-markdown: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Translations in this namespace are used by the forum user interface. + forum: + + # These translations are used by the composer (emoji autocompletion function). + composer: + bold_tooltip: Add bold text + code_tooltip: Insert code + italic_tooltip: Add italic text + link_tooltip: Add a link + ordered_list_tooltip: Add a numbered list + quote_tooltip: Insert a quote + unordered_list_tooltip: Add a bulleted list + header_tooltip: Add header text From f3c6743865e8374a2e815ff124f5188ffcea3e5b Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 12 Nov 2018 17:37:45 +1030 Subject: [PATCH 199/272] Add new mention button translation --- extensions/lang-english/locale/flarum-mentions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml index c4419dc57..6a294c747 100644 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -9,6 +9,7 @@ flarum-mentions: # These translations are used by the composer (reply autocompletion function). composer: + mention_tooltip: Mention a user or post reply_to_post_text: "Reply to #{number}" # These translations are used by the Notifications dropdown, a.k.a. "the bell". From ade5adbdd51e407c84bb2337b7e26c01005c280c Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Mon, 12 Nov 2018 20:16:58 +0100 Subject: [PATCH 200/272] Add message for UUID validation rule See: https://github.com/laravel/laravel/commit/c96995fb61632c6da0d7fc13cf6fd16a57f6c5ec#diff-9c04f727a922ad4f105b9ad764ec221d --- extensions/lang-english/locale/validation.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index 5a96c46c9..1b64c4741 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -90,6 +90,7 @@ validation: unique: "The :attribute has already been taken." uploaded: "The :attribute failed to upload." url: "The :attribute format is invalid." + uuid: "The :attribute must be a valid UUID." attributes: username: username From 1bf2b7a9faf62ffa313bc4b8a51b8faa1cba1d54 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Mon, 12 Nov 2018 20:44:12 +0100 Subject: [PATCH 201/272] Fix translation sorting --- extensions/lang-english/locale/flarum-markdown.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-markdown.yml b/extensions/lang-english/locale/flarum-markdown.yml index dd1161734..f327dd69d 100644 --- a/extensions/lang-english/locale/flarum-markdown.yml +++ b/extensions/lang-english/locale/flarum-markdown.yml @@ -11,9 +11,9 @@ flarum-markdown: composer: bold_tooltip: Add bold text code_tooltip: Insert code + header_tooltip: Add header text italic_tooltip: Add italic text link_tooltip: Add a link ordered_list_tooltip: Add a numbered list quote_tooltip: Insert a quote unordered_list_tooltip: Add a bulleted list - header_tooltip: Add header text From d7d521dd1091281857a19e36d6f3d90ddb83af49 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 21 Nov 2018 18:37:20 +1030 Subject: [PATCH 202/272] Remove copyright year from LICENSE --- extensions/lang-english/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/LICENSE b/extensions/lang-english/LICENSE index 57b3de07f..8630ec76f 100644 --- a/extensions/lang-english/LICENSE +++ b/extensions/lang-english/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2018 Toby Zerner +Copyright (c) Toby Zerner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 92b89532ecd9478ce33f1ffdf8ced0a7a93e9870 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 22 Nov 2018 16:32:09 +1030 Subject: [PATCH 203/272] Add translations for new admin tools button --- extensions/lang-english/locale/core.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index d6eaeaa05..f97711c2a 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -53,7 +53,8 @@ core: # These translations are used in the Dashboard page. dashboard: - help_link: Get Help + clear_cache_button: Clear Cache + tools_button: Tools # These translations are used in the Edit Custom CSS modal dialog. edit_css: From 6124f3d1808c7918ab2519a5d472ddc0c2352549 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Sat, 15 Dec 2018 11:37:27 +0100 Subject: [PATCH 204/272] Add language entry for starts_with rule and date_equals validation message These are commits from Laravel: https://github.com/laravel/laravel/commit/5052ab1fd7df20e4b643b3208b7b15472b8d6468#diff-9c04f727a922ad4f105b9ad764ec221d https://github.com/laravel/laravel/commit/78cb2685aade6416db81222f6f9b09edf9cdbb9c#diff-9c04f727a922ad4f105b9ad764ec221d --- extensions/lang-english/locale/validation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index 1b64c4741..7604253aa 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -17,6 +17,7 @@ validation: boolean: "The :attribute field must be true or false." confirmed: "The :attribute confirmation does not match." date: "The :attribute is not a valid date." + date_equals: "The :attribute must be a date equal to :date." date_format: "The :attribute does not match the format :other." different: "The :attribute and :other must be different." digits: "The :attribute must be :digits digits." @@ -85,6 +86,7 @@ validation: file: "The :attribute must be :size kilobytes." string: "The :attribute must be :size characters." array: "The :attribute must contain :size items." + starts_with: "The :attribute must start with one of the following: :values" string: "The :attribute must be a string." timezone: "The :attribute must be a valid zone." unique: "The :attribute has already been taken." From de29062cae5c1d7167876b16a76924c0f287b713 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sat, 16 Mar 2019 11:01:30 +0100 Subject: [PATCH 205/272] Add strings for revised mail settings page Refs flarum/core#1169. --- extensions/lang-english/locale/core.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index f97711c2a..207877e57 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -89,8 +89,9 @@ core: # These translations are used in the email page of the admin interface. email: - account_heading: SMTP Account addresses_heading: Addresses + driver_heading: Choose a driver + smtp_heading: SMTP Settings driver_label: Driver encryption_label: Encryption from_label: Sender @@ -98,7 +99,6 @@ core: host_label: Host password_label: => core.ref.password port_label: Port - server_heading: SMTP Server submit_button: => core.ref.save_changes text: Configure the SMTP settings and addresses your forum will use to send email. username_label: => core.ref.username From 3b8ca7d3baef897b4826bb9180f157f4449be712 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Tue, 19 Mar 2019 09:59:28 +0100 Subject: [PATCH 206/272] Add strings for all mail drivers' settings Refs flarum/core#1169. --- extensions/lang-english/locale/core.yml | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 207877e57..e551587de 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -90,18 +90,27 @@ core: # These translations are used in the email page of the admin interface. email: addresses_heading: Addresses - driver_heading: Choose a driver - smtp_heading: SMTP Settings + driver_heading: Choose a Driver driver_label: Driver - encryption_label: Encryption from_label: Sender heading: => core.ref.email - host_label: Host - password_label: => core.ref.password - port_label: Port + mailgun_heading: Mailgun Settings + mail_encryption_label: Encryption + mail_host_label: Host + mail_mailgun_secret_label: Secret key + mail_mailgun_domain_label: Domain + mail_mandrill_secret_label: Secret key + mail_password_label: => core.ref.password + mail_port_label: Port + mail_ses_key_label: Key + mail_ses_region_label: Region + mail_ses_secret_label: Secret + mail_username_label: => core.ref.username + mandrill_heading: Mandrill Settings + ses_heading: SES Settings + smtp_heading: SMTP Settings submit_button: => core.ref.save_changes - text: Configure the SMTP settings and addresses your forum will use to send email. - username_label: => core.ref.username + text: Configure the driver, settings and addresses your forum will use to send email. # These translations are used in the Extensions page. extensions: From b0bf8f9c0c56f777ace6a2d3b38fcfd5ee901c2c Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Sun, 12 May 2019 11:45:19 +0200 Subject: [PATCH 207/272] Add ends_with validation message See: https://github.com/laravel/laravel/commit/93c687418963f7c99b641fda905015054c785eb4#diff-9c04f727a922ad4f105b9ad764ec221d --- extensions/lang-english/locale/validation.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index 7604253aa..07936a147 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -25,6 +25,7 @@ validation: dimensions: "The :attribute has invalid image dimensions." distinct: "The :attribute field has a duplicate value." email: "The :attribute must be a valid email address." + ends_with: "The :attribute must end with one of the following: :values" exists: "The selected :attribute is invalid." file: "The :attribute must be a file." filled: "The :attribute field must have a value." From ec652583b52f171084ed6e2b0c9b05dd953b4896 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Sun, 12 May 2019 11:50:09 +0200 Subject: [PATCH 208/272] Fix translation sorting As reported by @Hiobi on the French language pack ([see commit](https://github.com/milescellar/lang-french/commit/416cbd9da9e0ed1beda69a5cdd1f8b1702c9b60b)). --- extensions/lang-english/locale/core.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index e551587de..0c0cf4e14 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -94,11 +94,10 @@ core: driver_label: Driver from_label: Sender heading: => core.ref.email - mailgun_heading: Mailgun Settings mail_encryption_label: Encryption mail_host_label: Host - mail_mailgun_secret_label: Secret key mail_mailgun_domain_label: Domain + mail_mailgun_secret_label: Secret key mail_mandrill_secret_label: Secret key mail_password_label: => core.ref.password mail_port_label: Port @@ -106,6 +105,7 @@ core: mail_ses_region_label: Region mail_ses_secret_label: Secret mail_username_label: => core.ref.username + mailgun_heading: Mailgun Settings mandrill_heading: Mandrill Settings ses_heading: SES Settings smtp_heading: SMTP Settings From 686bbdbb8a2572a8707002afc094dbcfa608a60f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Mon, 24 Jun 2019 09:39:26 +0200 Subject: [PATCH 209/272] added strings for the 419 csrf token timeout --- extensions/lang-english/locale/core.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 0c0cf4e14..6f8debdeb 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -462,6 +462,8 @@ core: 403_message: You do not have permission to access this page. 404_message: The page you requested could not be found. 404_return_link: "Return to {forum}" + 419_message: You have been inactive for too long. + 419_return_link: Go back, to try again 500_message: An error occurred while trying to load this page. 503_message: "{forum} is undergoing maintenance. Thanks for your patience!" From 9b81aef5f0028c813fbbb77a8e6955d91b1d68ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Mon, 24 Jun 2019 11:18:19 +0200 Subject: [PATCH 210/272] added labels for tags, by re-using those in the permisssion groups --- extensions/lang-english/locale/core.yml | 6 ++++-- extensions/lang-english/locale/flarum-tags.yml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 6171d7ecf..4926bdbc0 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -73,8 +73,8 @@ core: color_label: => core.ref.color delete_button: Delete Group delete_confirmation: "Are you sure you want to delete this group? The group members will NOT be deleted." - icon_label: Icon - icon_text: "Enter the name of any FontAwesome icon class, including the fas fa- prefix." + icon_label: => core.ref.icon + icon_text: => core.ref.icon_text name_label: Name plural_placeholder: Plural (e.g. Mods) singular_placeholder: Singular (e.g. Mod) @@ -553,6 +553,8 @@ core: discussions: Discussions # Referenced by flarum-statistics.yml edit: Edit email: Email + icon: Icon + icon_text: "Enter the name of any FontAwesome icon class, including the fas fa- prefix." load_more: Load More log_in: Log In log_out: Log Out diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index 94993b293..bef683fbe 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -14,6 +14,8 @@ flarum-tags: # These translations are used in the Edit Tag modal dialog. edit_tag: color_label: => core.ref.color + icon_label: => core.ref.icon + icon_text: => core.ref.icon_text delete_tag_button: Delete Tag delete_tag_confirmation: "Are you sure you want to delete this tag? The tag's discussions will NOT be deleted." description_label: Description From 96fbb50b646708cecb33683118b4435aa9c4fb26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Mon, 24 Jun 2019 13:33:24 +0200 Subject: [PATCH 211/272] updated constraint --- extensions/lang-english/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index dab62d602..eb519d110 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -5,7 +5,7 @@ "keywords": ["locale"], "license": "MIT", "require": { - "flarum/core": "^0.1.0-beta.8" + "flarum/core": "^0.1.0-beta.9" }, "extra": { "branch-alias": { From fdcb9af8eda92f939182b948ace93e70644c9511 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Mon, 1 Jul 2019 23:56:16 +0200 Subject: [PATCH 212/272] Restore order (in the universe) --- extensions/lang-english/locale/flarum-tags.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index bef683fbe..6ed5d7513 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -14,12 +14,12 @@ flarum-tags: # These translations are used in the Edit Tag modal dialog. edit_tag: color_label: => core.ref.color - icon_label: => core.ref.icon - icon_text: => core.ref.icon_text delete_tag_button: Delete Tag delete_tag_confirmation: "Are you sure you want to delete this tag? The tag's discussions will NOT be deleted." description_label: Description hide_label: Hide from All Discussions + icon_label: => core.ref.icon + icon_text: => core.ref.icon_text name_label: => flarum-tags.ref.name name_placeholder: => flarum-tags.ref.name slug_label: Slug From 03f4305497b291ad2b24b72b41f18a3e8e7d7621 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Wed, 14 Aug 2019 08:35:25 +0200 Subject: [PATCH 213/272] Add translations for user deletion status Replaces #142. Refs flarum/core#1750, flarum/core#1788. --- extensions/lang-english/locale/core.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 4926bdbc0..347795830 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -406,6 +406,8 @@ core: button: Controls delete_button: => core.ref.delete delete_confirmation: "Are you sure you want to delete this user? All of the user's posts will be deleted." + delete_error_message: "Deletion of user {username} ({email}) failed" + delete_success_message: "User {username} ({email}) was deleted" edit_button: => core.ref.edit # These translations are used in the alert that is shown when a new user has not confirmed their email address. From a8bd284c1a4bcbbeee15e6dbb2a7fbe30f049424 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Wed, 14 Aug 2019 18:09:51 +0200 Subject: [PATCH 214/272] Remove obsolete translation for maintenance mode We currently don't have a pretty error page for maintenance mode. --- extensions/lang-english/locale/core.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 347795830..cb8beabaf 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -467,7 +467,6 @@ core: 419_message: You have been inactive for too long. 419_return_link: Go back, to try again 500_message: An error occurred while trying to load this page. - 503_message: "{forum} is undergoing maintenance. Thanks for your patience!" # Translations in this namespace are displayed by the basic HTML discussion index. index: From f020719a8429c54c7cbfb43bab26edad0701134d Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Wed, 14 Aug 2019 19:38:54 +0200 Subject: [PATCH 215/272] Update error keys to match based on exception type ...instead of status code. There are (or will be) multiple different keys for similar errors with the same status code. In the future, we will use the error's "type" (see flarum/core#1843) to distinguish them. Refs flarum/core#1641. --- extensions/lang-english/locale/core.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index cb8beabaf..d2be135a5 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -461,12 +461,12 @@ core: # Translations in this namespace are displayed when Flarum encounters an error. error: - 403_message: You do not have permission to access this page. - 404_message: The page you requested could not be found. - 404_return_link: "Return to {forum}" - 419_message: You have been inactive for too long. - 419_return_link: Go back, to try again - 500_message: An error occurred while trying to load this page. + csrf_token_mismatch: You have been inactive for too long. + csrf_token_mismatch_return_link: Go back, to try again + forbidden: You do not have permission to access this page. + not_found: The page you requested could not be found. + not_found_return_link: "Return to {forum}" + unknown: An error occurred while trying to load this page. # Translations in this namespace are displayed by the basic HTML discussion index. index: From 405cd8764e868634e7393009edef2a5ec7e106c3 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Wed, 14 Aug 2019 19:39:52 +0200 Subject: [PATCH 216/272] Add error message for invalid confirmation tokens Fixes flarum/core#1337. --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index d2be135a5..0bd774488 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -464,6 +464,7 @@ core: csrf_token_mismatch: You have been inactive for too long. csrf_token_mismatch_return_link: Go back, to try again forbidden: You do not have permission to access this page. + invalid_confirmation_token: This confirmation link has already been used or is invalid. not_found: The page you requested could not be found. not_found_return_link: "Return to {forum}" unknown: An error occurred while trying to load this page. From 94a892f2c279bf63e7de669001dd69cc2d013bb6 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Thu, 22 Aug 2019 00:03:17 +0200 Subject: [PATCH 217/272] Add/fix error message for authentic-/authorization Refs flarum/core#1641. --- extensions/lang-english/locale/core.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 0bd774488..30ac821ff 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -463,10 +463,11 @@ core: error: csrf_token_mismatch: You have been inactive for too long. csrf_token_mismatch_return_link: Go back, to try again - forbidden: You do not have permission to access this page. invalid_confirmation_token: This confirmation link has already been used or is invalid. + not_authenticated: You do not have permission to access this page. Try again after logging in. not_found: The page you requested could not be found. not_found_return_link: "Return to {forum}" + permission_denied: You do not have permission to access this page. unknown: An error occurred while trying to load this page. # Translations in this namespace are displayed by the basic HTML discussion index. From be0b212e33ec4ad712b878e4d334b0dc19e2b5d6 Mon Sep 17 00:00:00 2001 From: Matthew Kilgore Date: Tue, 3 Sep 2019 17:51:31 -0400 Subject: [PATCH 218/272] Add translation for Edit User Permission (#145) Co-Authored-By: Franz Liedke --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 30ac821ff..0158e3442 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -151,6 +151,7 @@ core: delete_posts_forever_label: Delete posts forever delete_posts_label: Delete posts edit_posts_label: Edit posts + edit_users_label: Edit users global_heading: Global moderate_heading: Moderate new_group_button: New Group From 2329d8050a721ee96a68ce5576428f6af00aa4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sevilla=20Mart=C3=ADn?= <6401250+datitisev@users.noreply.github.com> Date: Mon, 9 Sep 2019 17:36:39 -0400 Subject: [PATCH 219/272] Add mark as read notification tooltip (#146) --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 0158e3442..2e561ac58 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -322,6 +322,7 @@ core: discussion_renamed_text: "{username} changed the title" empty_text: No Notifications mark_all_as_read_tooltip: => core.ref.mark_all_as_read + mark_as_read_tooltip: Mark as Read title: => core.ref.notifications tooltip: => core.ref.notifications From eaa6ca68ccd7102bd16a58e9cc990850e49d1cb6 Mon Sep 17 00:00:00 2001 From: Tolga ALTAS Date: Fri, 13 Sep 2019 19:02:47 +0300 Subject: [PATCH 220/272] image_tooltip for markdown (#147) --- extensions/lang-english/locale/flarum-markdown.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/flarum-markdown.yml b/extensions/lang-english/locale/flarum-markdown.yml index f327dd69d..dd4ad1666 100644 --- a/extensions/lang-english/locale/flarum-markdown.yml +++ b/extensions/lang-english/locale/flarum-markdown.yml @@ -12,6 +12,7 @@ flarum-markdown: bold_tooltip: Add bold text code_tooltip: Insert code header_tooltip: Add header text + image_tooltip: Add an image italic_tooltip: Add italic text link_tooltip: Add a link ordered_list_tooltip: Add a numbered list From 6605c736ce23a2cbf67934d860fee280d2359bbe Mon Sep 17 00:00:00 2001 From: Matteo Contrini Date: Sun, 10 Nov 2019 17:19:01 +0100 Subject: [PATCH 221/272] Improve the "last seen time" permission text This commit makes a bit clearer the fact that the permission serves to override the privacy settings of users. Without the "Always" word, one might think that the permission is required for users to see each other's last seen time in general. --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 2e561ac58..d2c0eaba7 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -162,7 +162,7 @@ core: sign_up_label: Sign up start_discussions_label: Start discussions view_discussions_label: View discussions - view_last_seen_at_label: View user last seen time + view_last_seen_at_label: Always view user last seen time view_post_ips_label: View post IP addresses view_user_list_label: View user list From 90d720f79cd30cfcb82dcc1cb09035b22c6e0b65 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sat, 30 Nov 2019 00:01:00 +0100 Subject: [PATCH 222/272] Update copyright claims in LICENSE --- extensions/lang-english/LICENSE | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/LICENSE b/extensions/lang-english/LICENSE index 8630ec76f..86cf0b3ce 100644 --- a/extensions/lang-english/LICENSE +++ b/extensions/lang-english/LICENSE @@ -1,6 +1,7 @@ The MIT License (MIT) -Copyright (c) Toby Zerner +Copyright (c) 2019 Stichting Flarum (Flarum Foundation) +Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From c9beb17f249e346af48e202af47884fa0c591a87 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 29 Nov 2019 23:17:08 +0000 Subject: [PATCH 223/272] Apply fixes from StyleCI --- extensions/lang-english/extend.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/extensions/lang-english/extend.php b/extensions/lang-english/extend.php index 7b40e0bb3..0fbf2080c 100644 --- a/extensions/lang-english/extend.php +++ b/extensions/lang-english/extend.php @@ -3,10 +3,8 @@ /* * This file is part of Flarum. * - * (c) Toby Zerner - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. + * For detailed copyright and license information, please view the + * LICENSE file that was distributed with this source code. */ -return new Flarum\Extend\LanguagePack; +return new Flarum\Extend\LanguagePack(); From 4ee1816f63e41667c942f4e37a633eaf82330a86 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 10 Jan 2020 20:34:24 +0100 Subject: [PATCH 224/272] Add translation for Mailgun region field Refs flarum/core#1834. Closes #144. --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index d2c0eaba7..08211699f 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -97,6 +97,7 @@ core: mail_encryption_label: Encryption mail_host_label: Host mail_mailgun_domain_label: Domain + mail_mailgun_region_label: Region mail_mailgun_secret_label: Secret key mail_mandrill_secret_label: Secret key mail_password_label: => core.ref.password From 34610ef1fcb29fa7c63cd0ef551dd593832c5669 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 7 Feb 2020 11:34:39 +0100 Subject: [PATCH 225/272] Add translations for flag improvements Refs flarum/flags#18. Closes flarum/lang-english#148. --- extensions/lang-english/locale/flarum-flags.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml index 8a72528dd..b4cbb1b69 100644 --- a/extensions/lang-english/locale/flarum-flags.yml +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -10,6 +10,7 @@ flarum-flags: # These translations are used in the Permissions page of the admin interface. permissions: flag_posts_label: Flag posts + flag_own_posts_label: Allow users to flag their own posts view_flags_label: View flagged posts # These translations are used in the Flags Settings modal dialog. @@ -24,11 +25,13 @@ flarum-flags: flag_post: confirmation_message: Thank you for flagging this post. Our moderators will look into it. dismiss_button: => core.ref.okay + reason_details_placeholder: Additional details (optional) reason_inappropriate_label: Inappropriate reason_inappropriate_text: "This post is offensive, abusive, or violates our community guidelines." + reason_missing_message: Please provide some details for our moderators. reason_off_topic_label: "Off-topic" reason_off_topic_text: This post is not relevant to the current discussion and should be moved elsewhere. - reason_other_label: Other + reason_other_label: Other (please specify) reason_spam_label: Spam reason_spam_text: This post is an advertisement. submit_button: => flarum-flags.ref.flag_post From 32411f2d3590b88f60adc10052c63ffb26e44adc Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 7 Feb 2020 11:42:02 +0100 Subject: [PATCH 226/272] Fix translation key Refs #148. --- extensions/lang-english/locale/flarum-flags.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml index b4cbb1b69..680e1ab0e 100644 --- a/extensions/lang-english/locale/flarum-flags.yml +++ b/extensions/lang-english/locale/flarum-flags.yml @@ -10,11 +10,11 @@ flarum-flags: # These translations are used in the Permissions page of the admin interface. permissions: flag_posts_label: Flag posts - flag_own_posts_label: Allow users to flag their own posts view_flags_label: View flagged posts # These translations are used in the Flags Settings modal dialog. settings: + flag_own_posts_label: Allow users to flag their own posts guidelines_url_label: Community Guidelines URL title: Flags Settings From 2768819ecf273c09f841c0285c62937c8d143201 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 7 Feb 2020 12:03:43 +0100 Subject: [PATCH 227/272] Add translation for incomplete email configuration Refs flarum/core#1763, flarum/core#1921. --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 08211699f..24a67c752 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -108,6 +108,7 @@ core: mail_username_label: => core.ref.username mailgun_heading: Mailgun Settings mandrill_heading: Mandrill Settings + not_sending_message: Flarum currently does not send emails. This can be due to the selected driver, or errors in its configuration. ses_heading: SES Settings smtp_heading: SMTP Settings submit_button: => core.ref.save_changes From 3a07f06028dee292628c89997a33b71f8cb14eae Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 7 Feb 2020 15:34:09 +0100 Subject: [PATCH 228/272] Add translation for throttling bypass permission Refs flarum/core#1255, flarum/core#1938. --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 24a67c752..2af7b6418 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -158,6 +158,7 @@ core: moderate_heading: Moderate new_group_button: New Group participate_heading: Participate + post_without_throttle_label: Reply multiple times without waiting read_heading: Read rename_discussions_label: Rename discussions reply_to_discussions_label: Reply to discussions From b2704c392946d80d1dca62b0ff034ea3c8936e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Tue, 3 Mar 2020 15:35:10 +0100 Subject: [PATCH 229/272] update deps, remove author --- extensions/lang-english/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index eb519d110..326028e34 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -5,7 +5,7 @@ "keywords": ["locale"], "license": "MIT", "require": { - "flarum/core": "^0.1.0-beta.9" + "flarum/core": "^0.1.0-beta.12" }, "extra": { "branch-alias": { From d4f030b0e1b240114fa129ae8b193e833fdfc00c Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 6 Mar 2020 20:39:41 +0100 Subject: [PATCH 230/272] tags: Add translations for HTML meta data Closes #154. Refs flarum/tags#72. --- extensions/lang-english/locale/flarum-tags.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index 6ed5d7513..af488cd4a 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -57,6 +57,11 @@ flarum-tags: # Translations in this namespace are used by the forum user interface. forum: + # These translations are displayed on the page that lists all tags. + all_tags: + meta_description_text: All Tags + meta_title_text: => flarum-tags.ref.tags + # These translations are used by the Choose Tags modal dialog. choose_tags: choose_primary_placeholder: "Choose a primary tag|Choose {count} primary tags" @@ -89,6 +94,10 @@ flarum-tags: removed_tags_text: "{username} removed the {tagsRemoved}." tags_text: "{tags} tag|{tags} tags" + # These translations are used when visiting a single tag's discussion list. + tag: + meta_description_text: "All discussions with the {tag} tag" + # Translations in this namespace are used by the forum and admin interfaces. lib: From a111ffe07b972d0c683f6c57a0ae3f472afdb2ce Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov <38059171+askvortsov1@users.noreply.github.com> Date: Fri, 6 Mar 2020 15:42:08 -0500 Subject: [PATCH 231/272] Tweak confirmation message for deleting users Posts are no longer deleted when users are deleted, so the message should reflect that. (#157) --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 2af7b6418..36e62b9c9 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -410,7 +410,7 @@ core: user_controls: button: Controls delete_button: => core.ref.delete - delete_confirmation: "Are you sure you want to delete this user? All of the user's posts will be deleted." + delete_confirmation: "Are you sure you want to delete this user? The user's posts will NOT be deleted." delete_error_message: "Deletion of user {username} ({email}) failed" delete_success_message: "User {username} ({email}) was deleted" edit_button: => core.ref.edit From 82c67588e437f99e149a08072be6e4a12682015b Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Tue, 21 Apr 2020 21:05:49 +0200 Subject: [PATCH 232/272] Add translations for hidden permission groups Refs flarum/core#2129, flarum/core#845, closes #153. --- extensions/lang-english/locale/core.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 36e62b9c9..38c9dac10 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -73,6 +73,7 @@ core: color_label: => core.ref.color delete_button: Delete Group delete_confirmation: "Are you sure you want to delete this group? The group members will NOT be deleted." + hide_label: Hide on forum icon_label: => core.ref.icon icon_text: => core.ref.icon_text name_label: Name @@ -165,6 +166,7 @@ core: sign_up_label: Sign up start_discussions_label: Start discussions view_discussions_label: View discussions + view_hidden_groups_label: View hidden group badges view_last_seen_at_label: Always view user last seen time view_post_ips_label: View post IP addresses view_user_list_label: View user list From 899d0ff4cabc2e002a40dae9fa91a44ec6e9590e Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 24 Apr 2020 23:40:05 +0200 Subject: [PATCH 233/272] Add locales for new post deletion confirmation Refs flarum/core#2135. Extracted from #162. --- extensions/lang-english/locale/core.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 38c9dac10..3ad62e15e 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -340,7 +340,9 @@ core: # These translations are used by the post control buttons. post_controls: delete_button: => core.ref.delete + delete_confirmation: "Are you sure you want to delete this post forever? This action cannot be undone." delete_forever_button: => core.ref.delete_forever + hide_confirmation: "Are you sure you want to delete this post?" edit_button: => core.ref.edit restore_button: => core.ref.restore From 9f846c5672940d56ca69e9f988222c5a6540b030 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 24 Apr 2020 23:41:57 +0200 Subject: [PATCH 234/272] Fix order --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 3ad62e15e..6b0998353 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -342,8 +342,8 @@ core: delete_button: => core.ref.delete delete_confirmation: "Are you sure you want to delete this post forever? This action cannot be undone." delete_forever_button: => core.ref.delete_forever - hide_confirmation: "Are you sure you want to delete this post?" edit_button: => core.ref.edit + hide_confirmation: "Are you sure you want to delete this post?" restore_button: => core.ref.restore # These translations are used in the scrubber to the right of the post stream. From e811871d094c2ae6b9d299ff7bb0e28b7bf4d03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Mon, 4 May 2020 11:04:45 +0200 Subject: [PATCH 235/272] Release v0.1.0-beta.13 --- extensions/lang-english/CHANGELOG.md | 11 +++++++++++ extensions/lang-english/composer.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 extensions/lang-english/CHANGELOG.md diff --git a/extensions/lang-english/CHANGELOG.md b/extensions/lang-english/CHANGELOG.md new file mode 100644 index 000000000..8e20ccfe7 --- /dev/null +++ b/extensions/lang-english/CHANGELOG.md @@ -0,0 +1,11 @@ +# Changelog + +## [0.1.0-beta.13](https://github.com/flarum/lang-english/compare/v0.1.0-beta.12...v0.1.0-beta.13) + +### Added +- Keys for hidden permission groups (#153, flarum/core#2129, flarum/core#845) +- Keys for post deletion confirmation (#162, flarum/core#2135) +- Keys for HTML meta data (#154, flarum/tags#72) + +### Changed +- Key in confirmation deletion modal of user (#157) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 326028e34..68ad9c1fc 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -5,7 +5,7 @@ "keywords": ["locale"], "license": "MIT", "require": { - "flarum/core": "^0.1.0-beta.12" + "flarum/core": "^0.1.0-beta.13" }, "extra": { "branch-alias": { From b5039d127e930201f94998bb6fa3216d343f2ec9 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov <38059171+askvortsov1@users.noreply.github.com> Date: Tue, 19 May 2020 18:50:23 -0400 Subject: [PATCH 236/272] Companion changes for https://github.com/flarum/core/pull/2174 (#166) --- extensions/lang-english/locale/core.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 6b0998353..8ec5f39cc 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -40,6 +40,8 @@ core: basics: all_discussions_label: => core.ref.all_discussions default_language_heading: Default Language + display_name_heading: User Display Name + display_name_text: Select the driver that should be used for users' display names. By default, the username is shown. forum_description_heading: Forum Description forum_description_text: Enter a short sentence or two that describes your community. This will appear in the meta tag and show up in search engines. forum_title_heading: Forum Title From f779e2b7b7f8fe9efa5054f8918c16f2e8124eee Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov <38059171+askvortsov1@users.noreply.github.com> Date: Wed, 3 Jun 2020 06:46:27 -0400 Subject: [PATCH 237/272] Add meta title to following page (#159) Refs flarum/core#495, flarum/subscriptions#23. --- extensions/lang-english/locale/flarum-subscriptions.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/lang-english/locale/flarum-subscriptions.yml b/extensions/lang-english/locale/flarum-subscriptions.yml index 03b11d193..5968e38de 100644 --- a/extensions/lang-english/locale/flarum-subscriptions.yml +++ b/extensions/lang-english/locale/flarum-subscriptions.yml @@ -18,6 +18,10 @@ flarum-subscriptions: unfollow_button: Unfollow unignore_button: Unignore + # These translations are used on the page that displays all subscriptions. + following: + meta_title_text: => flarum-subscriptions.ref.following + # These translations are used on the index page, peripheral to the discussion list. index: following_link: => flarum-subscriptions.ref.following From 424b07144ed4ad1d78d866a052ad5eefe687af4f Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Wed, 3 Jun 2020 22:41:24 -0400 Subject: [PATCH 238/272] Remove SES translations --- extensions/lang-english/locale/core.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 8ec5f39cc..35963c4e1 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -105,14 +105,10 @@ core: mail_mandrill_secret_label: Secret key mail_password_label: => core.ref.password mail_port_label: Port - mail_ses_key_label: Key - mail_ses_region_label: Region - mail_ses_secret_label: Secret mail_username_label: => core.ref.username mailgun_heading: Mailgun Settings mandrill_heading: Mandrill Settings not_sending_message: Flarum currently does not send emails. This can be due to the selected driver, or errors in its configuration. - ses_heading: SES Settings smtp_heading: SMTP Settings submit_button: => core.ref.save_changes text: Configure the driver, settings and addresses your forum will use to send email. From 153c650c0da5f054cfe1e3ce0a60515423368b01 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov <38059171+askvortsov1@users.noreply.github.com> Date: Sat, 27 Jun 2020 14:22:41 -0400 Subject: [PATCH 239/272] Add 'all discussions' meta title (#158) * Add homepage meta title --- extensions/lang-english/locale/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 35963c4e1..7523375a3 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -298,6 +298,7 @@ core: cannot_start_discussion_button: Can't Start Discussion mark_all_as_read_confirmation: "Are you sure you want to mark all discussions as read?" mark_all_as_read_tooltip: => core.ref.mark_all_as_read + meta_title_text: => core.ref.all_discussions refresh_tooltip: Refresh start_discussion_button: => core.ref.start_a_discussion From c7a8c20b8d2c7430cff957fa48d3d3ee230cd0fd Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 24 Jul 2020 16:39:00 +0200 Subject: [PATCH 240/272] Remove locales for Mandrill mail driver Refs flarum/core#2055. --- extensions/lang-english/locale/core.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 7523375a3..f1c4cf03b 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -102,12 +102,10 @@ core: mail_mailgun_domain_label: Domain mail_mailgun_region_label: Region mail_mailgun_secret_label: Secret key - mail_mandrill_secret_label: Secret key mail_password_label: => core.ref.password mail_port_label: Port mail_username_label: => core.ref.username mailgun_heading: Mailgun Settings - mandrill_heading: Mandrill Settings not_sending_message: Flarum currently does not send emails. This can be due to the selected driver, or errors in its configuration. smtp_heading: SMTP Settings submit_button: => core.ref.save_changes From 1ee33de48f6b90dc1376f84101f8919eb794734c Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov <38059171+askvortsov1@users.noreply.github.com> Date: Sun, 26 Jul 2020 16:59:02 -0400 Subject: [PATCH 241/272] Added translations for Send Test Mail feature (#156) * Added translations for Send Test Mail feature --- extensions/lang-english/locale/core.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index f1c4cf03b..2bd3111c0 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -107,6 +107,10 @@ core: mail_username_label: => core.ref.username mailgun_heading: Mailgun Settings not_sending_message: Flarum currently does not send emails. This can be due to the selected driver, or errors in its configuration. + send_test_mail_button: Send + send_test_mail_heading: Send Test Mail + send_test_mail_success: Test mail sent successfully! + send_test_mail_text: This will send an email using the above configuration to your email, {email}. smtp_heading: SMTP Settings submit_button: => core.ref.save_changes text: Configure the driver, settings and addresses your forum will use to send email. @@ -541,6 +545,18 @@ core: If you do not wish to change your password, just ignore this email and nothing will happen. + # These translations are used when testing mailing configuration + send_test: + subject: Flarum Email Test + body: | + Hey {username}! + + This is a test email to confirm that your Flarum email configuration is working properly. + + If this was you, this email means that your configuration works! + + If this was not you, please ignore this email. + ## # REUSED TRANSLATIONS - These keys should not be used directly in code! ## From 4888bedbfe9f7424ce001129ccf3552d5ecefc5c Mon Sep 17 00:00:00 2001 From: Qiaeru <22643035+qiaeru@users.noreply.github.com> Date: Fri, 14 Aug 2020 11:08:10 +0200 Subject: [PATCH 242/272] Add missing full stop for some validation messages (#170) See: https://github.com/laravel/laravel/commit/f121af8985d1dbb665cb9ca4b6a9f7dbb6211a7c --- extensions/lang-english/locale/validation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index 07936a147..55fe0ed5c 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -25,7 +25,7 @@ validation: dimensions: "The :attribute has invalid image dimensions." distinct: "The :attribute field has a duplicate value." email: "The :attribute must be a valid email address." - ends_with: "The :attribute must end with one of the following: :values" + ends_with: "The :attribute must end with one of the following: :values." exists: "The selected :attribute is invalid." file: "The :attribute must be a file." filled: "The :attribute field must have a value." @@ -87,7 +87,7 @@ validation: file: "The :attribute must be :size kilobytes." string: "The :attribute must be :size characters." array: "The :attribute must contain :size items." - starts_with: "The :attribute must start with one of the following: :values" + starts_with: "The :attribute must start with one of the following: :values." string: "The :attribute must be a string." timezone: "The :attribute must be a valid zone." unique: "The :attribute has already been taken." From fda5e626f7b2dc582d8a16e173ed39ff0ef4e597 Mon Sep 17 00:00:00 2001 From: Qiaeru <22643035+qiaeru@users.noreply.github.com> Date: Fri, 14 Aug 2020 11:09:05 +0200 Subject: [PATCH 243/272] Add new password rule language line (#151) See: https://github.com/laravel/laravel/commit/050c1d880ec1d48ef40d7a0f2b2f1040c23cebb9 Co-authored-by: Miles Cellar --- extensions/lang-english/locale/validation.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index 55fe0ed5c..14f3ed928 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -72,6 +72,7 @@ validation: not_in: "The selected :attribute is invalid." not_regex: "The :attribute format is invalid." numeric: "The :attribute must be a number." + password: "The password is incorrect." present: "The :attribute field must be present." regex: "The :attribute format is invalid." required: "The :attribute field is required." From 47233ba7a8b75adfc2171c0cded5f818dc1fe450 Mon Sep 17 00:00:00 2001 From: Qiaeru <22643035+qiaeru@users.noreply.github.com> Date: Mon, 17 Aug 2020 01:12:42 +0200 Subject: [PATCH 244/272] Strings containing specific characters must be quoted (#169) Please see: https://symfony.com/doc/current/components/yaml/yaml_format.html#strings --- extensions/lang-english/locale/core.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 2bd3111c0..45425768a 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -109,8 +109,8 @@ core: not_sending_message: Flarum currently does not send emails. This can be due to the selected driver, or errors in its configuration. send_test_mail_button: Send send_test_mail_heading: Send Test Mail - send_test_mail_success: Test mail sent successfully! - send_test_mail_text: This will send an email using the above configuration to your email, {email}. + send_test_mail_success: "Test mail sent successfully!" + send_test_mail_text: "This will send an email using the above configuration to your email, {email}." smtp_heading: SMTP Settings submit_button: => core.ref.save_changes text: Configure the driver, settings and addresses your forum will use to send email. From 4cb95b1869ca76a289c5f0e124f453e6bb5fd79b Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov <38059171+askvortsov1@users.noreply.github.com> Date: Wed, 30 Sep 2020 15:52:49 -0400 Subject: [PATCH 245/272] Translate emails for subscriptions (#168) --- .../locale/flarum-subscriptions.yml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/extensions/lang-english/locale/flarum-subscriptions.yml b/extensions/lang-english/locale/flarum-subscriptions.yml index 5968e38de..f1159f74e 100644 --- a/extensions/lang-english/locale/flarum-subscriptions.yml +++ b/extensions/lang-english/locale/flarum-subscriptions.yml @@ -47,6 +47,28 @@ flarum-subscriptions: notify_alert_tooltip: Get a forum notification when there are new posts notify_email_tooltip: Get an email when there are new posts + # Translations in this namespace are used in emails sent by the forum. + email: + + # These translations are used in emails sent when a post is made in a subscribed discussion + new_post: + subject: "[New Post] {title}" + body: | + Hey {recipient_display_name}! + + {poster_display_name} made a post in a discussion you're following: {title}. + + To view the new activity, check out the following link: + {url} + + --- + + {content} + + --- + + You won't receive any more notifications about this discussion until you're up-to-date. + ## # REUSED TRANSLATIONS - These keys should not be used directly in code! ## From a91ec3163785dcbe289989320050aeb3f32e8bb0 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov <38059171+askvortsov1@users.noreply.github.com> Date: Thu, 1 Oct 2020 11:18:44 -0400 Subject: [PATCH 246/272] Translate emails for mentions (#167) --- .../lang-english/locale/flarum-mentions.yml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml index 6a294c747..a46a07950 100644 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ b/extensions/lang-english/locale/flarum-mentions.yml @@ -35,3 +35,35 @@ flarum-mentions: # These translations are used in the user profile page and profile popup. user: mentions_link: Mentions + + # Translations in this namespace are used in emails sent by the forum. + email: + + # These translations are used in emails sent when a post is replied to + post_mentioned: + subject: "{replier_display_name} replied to your post in {title}" + body: | + Hey {recipient_display_name}! + + {replier_display_name} replied to your post (#{post_number}) in {title}. + + {url} + + --- + + {content} + + # These translations are used in emails sent when a user is mentioned + user_mentioned: + subject: "{mentioner_display_name} mentioned you in {title}" + body: | + Hey {recipient_display_name}! + + {mentioner_display_name} mentioned you in a post in {title}. + + {url} + + --- + + {content} + From 563c03fc079b9aea3a386e8d2b66c0423c10337f Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov <38059171+askvortsov1@users.noreply.github.com> Date: Fri, 2 Oct 2020 18:01:16 -0400 Subject: [PATCH 247/272] Add extension dependency error translations (#172) --- extensions/lang-english/locale/core.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 45425768a..96c91be34 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -435,6 +435,8 @@ core: # These translations are displayed as error messages. error: + dependent_extensions_message: "Cannot disable {extension} until the following dependent extensions are disabled: {extensions}" + missing_dependencies_message: "Cannot enable {extension} until the following dependencies are enabled: {extensions}" generic_message: "Oops! Something went wrong. Please reload the page and try again." not_found_message: The requested resource was not found. permission_denied_message: You do not have permission to do that. From 880dff0e373d51152f91013c2f056ef7e3628b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Tue, 20 Oct 2020 16:41:02 +0200 Subject: [PATCH 248/272] changelog and dep for v0.1.0-beta.14 --- extensions/lang-english/CHANGELOG.md | 18 ++++++++++++++++++ extensions/lang-english/composer.json | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/CHANGELOG.md b/extensions/lang-english/CHANGELOG.md index 8e20ccfe7..3a8e5725c 100644 --- a/extensions/lang-english/CHANGELOG.md +++ b/extensions/lang-english/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +### Added +- Keys for extension dependency errors (#172) +- Keys for emails from flarum/mentions (#167) +- Keys for emails from flarum/subscriptions (#168) +- Key for password validation rule (#151) +- Keys for email testing in the admin area (#156) +- Key for all discussions meta title (#158) +- Key for following page meta title (#159) +- Keys for display name drivers (#166) + +### Changed +- Quoted translated string that contains variable (#169) +- Period added to stop line in validation messages (#170) + +### Removed +- Keys for mandrill email driver +- Keys for SES email driver + ## [0.1.0-beta.13](https://github.com/flarum/lang-english/compare/v0.1.0-beta.12...v0.1.0-beta.13) ### Added diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 68ad9c1fc..90b6a8d4c 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -5,7 +5,7 @@ "keywords": ["locale"], "license": "MIT", "require": { - "flarum/core": "^0.1.0-beta.13" + "flarum/core": "^0.1.0-beta.14" }, "extra": { "branch-alias": { From 3937a95392ce8a95add840a511645ff40155d96c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hasan=20=C3=96zbey?= <48382593+the-turk@users.noreply.github.com> Date: Fri, 23 Oct 2020 02:05:14 +0300 Subject: [PATCH 249/272] Inform the user that their edit has been made (#163) --- extensions/lang-english/locale/core.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 96c91be34..debfabd3f 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -228,8 +228,10 @@ core: # These translations are used by the composer when editing a post. composer_edit: discard_confirmation: "You have not saved your changes. Do you wish to discard them?" + edited_message: Your edit was made. post_link: "Post #{number} in {discussion}" submit_button: => core.ref.save_changes + view_button: => core.ref.view # These translations are used by the composer when replying to a discussion. composer_reply: @@ -237,7 +239,7 @@ core: discard_confirmation: "You have not posted your reply. Do you wish to discard it?" posted_message: Your reply was posted. submit_button: Post Reply - view_button: View + view_button: => core.ref.view # These translations are used by the discussion control buttons. discussion_controls: @@ -604,6 +606,7 @@ core: start_a_discussion: Start a Discussion username: Username users: Users # Referenced by flarum-statistics.yml + view: View write_a_reply: Write a Reply... you: You # Referenced by flarum-likes.yml, flarum-mentions.yml From 3b1466c450cc3cfcc9428d46709c6fdf05c3a143 Mon Sep 17 00:00:00 2001 From: Qiaeru <22643035+qiaeru@users.noreply.github.com> Date: Fri, 23 Oct 2020 01:29:57 +0200 Subject: [PATCH 250/272] Fix order (#174) --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index debfabd3f..ba2394c49 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -438,8 +438,8 @@ core: # These translations are displayed as error messages. error: dependent_extensions_message: "Cannot disable {extension} until the following dependent extensions are disabled: {extensions}" - missing_dependencies_message: "Cannot enable {extension} until the following dependencies are enabled: {extensions}" generic_message: "Oops! Something went wrong. Please reload the page and try again." + missing_dependencies_message: "Cannot enable {extension} until the following dependencies are enabled: {extensions}" not_found_message: The requested resource was not found. permission_denied_message: You do not have permission to do that. rate_limit_exceeded_message: You're going a little too quickly. Please try again in a few seconds. From aab335e4f3a4f2ac3661cb26a4c5afd4257c7a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Tue, 27 Oct 2020 13:31:48 +0100 Subject: [PATCH 251/272] changelog for beta 14.1 --- extensions/lang-english/CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/extensions/lang-english/CHANGELOG.md b/extensions/lang-english/CHANGELOG.md index 3a8e5725c..d4621a9bf 100644 --- a/extensions/lang-english/CHANGELOG.md +++ b/extensions/lang-english/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.1.0-beta.14.1](https://github.com/flarum/lang-english/compare/v0.1.0-beta.14...v0.1.0-beta.14.1) + +### Fixed +- Missing translation keys for edited post (#163) + +## [0.1.0-beta.14](https://github.com/flarum/lang-english/compare/v0.1.0-beta.13...v0.1.0-beta.14) + ### Added - Keys for extension dependency errors (#172) - Keys for emails from flarum/mentions (#167) From 2d3c646876cd853aa826de2f670c5bfbfce71d34 Mon Sep 17 00:00:00 2001 From: Charlie <13856015+KyrneDev@users.noreply.github.com> Date: Tue, 24 Nov 2020 23:11:10 -0800 Subject: [PATCH 252/272] AdminUx translation additions (#176) Also add composer metadata for admin ux redesign --- extensions/lang-english/composer.json | 6 ++ extensions/lang-english/locale/core.yml | 74 ++++++++++++------- .../lang-english/locale/flarum-tags.yml | 8 +- 3 files changed, 59 insertions(+), 29 deletions(-) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 90b6a8d4c..7c45466ca 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -13,6 +13,12 @@ }, "flarum-extension": { "title": "English", + "category": "language", + "info": { + "donate": "https://flarum.org/donate/", + "website": "https://flarum.org", + "support": "https://discuss.flarum.org" + }, "icon": { "image": "icon.svg", "backgroundColor": "#00247d", diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index ba2394c49..601f35119 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -7,13 +7,6 @@ core: # Translations in this namespace are used by the admin interface. admin: - # These translations are used in the placeholder Add Extension modal dialog. - add_extension: - developer_text: "If you're a developer, you can read the docs and have a go at building your own extensions." - install_text: "In the meantime, you can look for extensions at the Flarum Community site and install them manually using Composer." - temporary_text: "One day in the not-too-distant future, this dialog will allow you to add an extension to your forum with ease. We're building an ecosystem as we speak!" - title: Add Extension - # These translations are used in the Appearance page. appearance: colored_header_label: Colored Header @@ -26,6 +19,7 @@ core: custom_styles_heading: Custom Styles custom_styles_text: Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles. dark_mode_label: Dark Mode + description: "Customize your forum's colors, logos, and other variables." edit_css_button: Edit Custom CSS edit_footer_button: => core.ref.custom_footer_title edit_header_button: => core.ref.custom_header_title @@ -35,11 +29,13 @@ core: logo_heading: Logo logo_text: Upload an image to be displayed in place of the forum title. submit_button: => core.ref.save_changes + title: Appearance # These translations are used in the Basics page. basics: all_discussions_label: => core.ref.all_discussions default_language_heading: Default Language + description: "Set your forum title, language, and other basic settings." display_name_heading: User Display Name display_name_text: Select the driver that should be used for users' display names. By default, the username is shown. forum_description_heading: Forum Description @@ -50,12 +46,15 @@ core: saved_message: Your changes were saved. show_language_selector_label: Show language selector submit_button: => core.ref.save_changes + title: Basics welcome_banner_heading: Welcome Banner welcome_banner_text: Configure the text that displays in the banner on the All Discussions page. Use this to welcome guests to your forum. # These translations are used in the Dashboard page. dashboard: clear_cache_button: Clear Cache + description: Your forum at a glance. + title: Dashboard tools_button: Tools # These translations are used in the Edit Custom CSS modal dialog. @@ -93,10 +92,10 @@ core: # These translations are used in the email page of the admin interface. email: addresses_heading: Addresses + description: "Configure the driver, settings and addresses your forum will use to send email." driver_heading: Choose a Driver driver_label: Driver from_label: Sender - heading: => core.ref.email mail_encryption_label: Encryption mail_host_label: Host mail_mailgun_domain_label: Domain @@ -113,16 +112,31 @@ core: send_test_mail_text: "This will send an email using the above configuration to your email, {email}." smtp_heading: SMTP Settings submit_button: => core.ref.save_changes - text: Configure the driver, settings and addresses your forum will use to send email. + title: => core.ref.email - # These translations are used in the Extensions page. - extensions: - add_button: Add Extension - settings_button: => core.ref.settings + # These translations are used on default extension pages. + extension: + confirm_uninstall: Uninstalling will remove all database entires and assets related to the extension. Are you sure you want to contiune? + disabled: Disabled + enabled: Enabled + enable_to_see: Enable the extension to view and change settings. + info_links: + discuss: Discuss + documentation: Documentation + donate: Donate + source: Source + support: Support + website: Website + no_permissions: No Permissions + no_settings: No Settings + open_modal: Open Settings + permissions_title: Permissions + saved_message: Your changes were saved. uninstall_button: Uninstall - # These translations are used in the session dropdown menu. + # These translations are used in the secondary header. header: + get_help: Get Help log_out_button: => core.ref.log_out # These translations are used in the modal dialog displayed when loading extensions. @@ -131,18 +145,26 @@ core: # These translations are used in the navigation bar. nav: - appearance_button: Appearance - appearance_text: "Customize your forum's colors, logos, and other variables." - basics_button: Basics - basics_text: "Set your forum title, language, and other basic settings." - dashboard_button: Dashboard - dashboard_text: Your forum at a glance. + appearance_button: => core.admin.appearance.title + appearance_title: => core.admin.appearence.description + basics_button: => core.admin.basics.title + basics_title: => core.admin.basics.description + categories: + authentication: Authentication + discussion: Discussion + feature: Features + formatting: Formatting + language: Languages + moderation: Moderation + other: Other Extensions + theme: Themes + dashboard_button: => core.admin.dashboard.title + dashboard_title: => core.admin.dashboard.description email_button: => core.ref.email - email_text: "Configure your forum's email settings." - extensions_button: Extensions - extensions_text: Add extra functionality to your forum and make it your own. - permissions_button: Permissions - permissions_text: Configure who can see and do what. + email_title: => core.admin.email.description + permissions_button: => core.admin.permissions.title + permissions_title: => core.admin.permissions.description + search_placeholder: Search Extensions # These translations are used in the Permissions page of the admin interface. permissions: @@ -153,6 +175,7 @@ core: delete_discussions_label: Delete discussions delete_posts_forever_label: Delete posts forever delete_posts_label: Delete posts + description: Configure who can see and do what. edit_posts_label: Edit posts edit_users_label: Edit users global_heading: Global @@ -165,6 +188,7 @@ core: reply_to_discussions_label: Reply to discussions sign_up_label: Sign up start_discussions_label: Start discussions + title: Permissions view_discussions_label: View discussions view_hidden_groups_label: View hidden group badges view_last_seen_at_label: Always view user last seen time diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index af488cd4a..f9cfda594 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -24,7 +24,7 @@ flarum-tags: name_placeholder: => flarum-tags.ref.name slug_label: Slug submit_button: => core.ref.save_changes - title: => flarum-tags.ref.create_tag + title: Create Tag # These translations are used in the navigation bar. nav: @@ -49,10 +49,11 @@ flarum-tags: # These translations are used in the Tags page. tags: about_tags_text: "Tags are used to categorize discussions. Primary tags are like traditional forum categories: they can be arranged in a two-level hierarchy. Secondary tags do not have hierarchy or order, and are useful for micro-categorization." - create_tag_button: => flarum-tags.ref.create_tag + create_primary_tag_button: Create Primary Tag + create_secondary_tag_button: Create Secondary Tag primary_heading: Primary Tags secondary_heading: Secondary Tags - settings_button: Settings + settings_heading: Settings # Translations in this namespace are used by the forum user interface. forum: @@ -110,6 +111,5 @@ flarum-tags: # Translations in this namespace are referenced by two or more unique keys. ref: - create_tag: Create Tag name: Name tags: Tags From dc3599a5171360a8503c09bce91b1ddd742a1295 Mon Sep 17 00:00:00 2001 From: Charlie <13856015+KyrneDev@users.noreply.github.com> Date: Mon, 7 Dec 2020 12:17:33 -0800 Subject: [PATCH 253/272] AdminUX Small Patch Translations (#177) * Core Configuration * More verbose no settings/permissions --- extensions/lang-english/locale/core.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 601f35119..7f499864a 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -127,8 +127,8 @@ core: source: Source support: Support website: Website - no_permissions: No Permissions - no_settings: No Settings + no_permissions: This extension has no permissions. + no_settings: This extension has no settings. open_modal: Open Settings permissions_title: Permissions saved_message: Your changes were saved. @@ -151,6 +151,7 @@ core: basics_title: => core.admin.basics.description categories: authentication: Authentication + core: Core Configuration discussion: Discussion feature: Features formatting: Formatting From 01e71e7cbf1f1e41c1933acad066658641d30ecd Mon Sep 17 00:00:00 2001 From: Matt Kilgore Date: Mon, 7 Dec 2020 15:18:23 -0500 Subject: [PATCH 254/272] Add slug driver translations (#179) --- extensions/lang-english/locale/core.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 7f499864a..c52af6691 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -45,6 +45,8 @@ core: home_page_text: Choose the page which users will first see when they visit your forum. saved_message: Your changes were saved. show_language_selector_label: Show language selector + slug_driver_heading: "Slug Driver: {model}" + slug_driver_text: Select a driver to be used for slugging this model. submit_button: => core.ref.save_changes title: Basics welcome_banner_heading: Welcome Banner From b67fa3f277e23bad28a7c22d87c8322e45dcd3d8 Mon Sep 17 00:00:00 2001 From: Matt Kilgore Date: Mon, 7 Dec 2020 15:51:37 -0500 Subject: [PATCH 255/272] flarum/nicknames extension translations (#178) --- .../lang-english/locale/flarum-nicknames.yml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 extensions/lang-english/locale/flarum-nicknames.yml diff --git a/extensions/lang-english/locale/flarum-nicknames.yml b/extensions/lang-english/locale/flarum-nicknames.yml new file mode 100644 index 000000000..5053368ae --- /dev/null +++ b/extensions/lang-english/locale/flarum-nicknames.yml @@ -0,0 +1,24 @@ +flarum-nicknames: + admin: + permissions: + edit_own_nickname_label: Edit own nickname + settings: + max_label: Maximum nickname length + min_label: Minimum nickname length + regex_label: Regular expression for validation + unique_label: Require unique nicknames? + wrong_driver: You must select "nickname" as the display name driver on the Basics Page for this extension to take effect. + api: + invalid_nickname_message: This nickname is invalid. Please contact your forum administrator for more information on nickname rules. + forum: + change_nickname: + submit_button: => core.ref.save_changes + title: => flarum-nicknames.ref.change_nickname + edit_user: + nicknames_heading: => flarum-nicknames.ref.change_nickname + nicknames_text: Nickname + settings: + change_nickname_button: => flarum-nicknames.ref.change_nickname + + ref: + change_nickname: Change Nickname From 0892b83c887c4fe7f0cd3605ccb720bbe11a3806 Mon Sep 17 00:00:00 2001 From: Robert Korulczyk Date: Fri, 18 Dec 2020 02:50:15 +0100 Subject: [PATCH 256/272] Fix appearance title typo (#180) --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index c52af6691..095169a61 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -148,7 +148,7 @@ core: # These translations are used in the navigation bar. nav: appearance_button: => core.admin.appearance.title - appearance_title: => core.admin.appearence.description + appearance_title: => core.admin.appearance.description basics_button: => core.admin.basics.title basics_title: => core.admin.basics.description categories: From 833dfb1fae8d8ec7dd83ad2f4e8f69cd687ac1a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Sun, 20 Dec 2020 21:16:48 +0100 Subject: [PATCH 257/272] changes for beta 15 --- extensions/lang-english/CHANGELOG.md | 10 ++++++++++ extensions/lang-english/composer.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/CHANGELOG.md b/extensions/lang-english/CHANGELOG.md index d4621a9bf..2723f5f1d 100644 --- a/extensions/lang-english/CHANGELOG.md +++ b/extensions/lang-english/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## [0.1.0-beta.14.1](https://github.com/flarum/lang-english/compare/v0.1.0-beta.14.1...v0.1.0-beta.15) + +### Added +- Keys for new admin interface (#176) +- Keys for slug driver (#179) +- Keys for flarum/nicknames (#178) + +### Fixes +- Appearance title key references incorrect key (#180) + ## [0.1.0-beta.14.1](https://github.com/flarum/lang-english/compare/v0.1.0-beta.14...v0.1.0-beta.14.1) ### Fixed diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 7c45466ca..75c3590cd 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -5,7 +5,7 @@ "keywords": ["locale"], "license": "MIT", "require": { - "flarum/core": "^0.1.0-beta.14" + "flarum/core": "^0.1.0-beta.15" }, "extra": { "branch-alias": { From 135c662cf7b0cf3b4f62bdf2671e9af01cd6f5b6 Mon Sep 17 00:00:00 2001 From: Qiaeru <22643035+qiaeru@users.noreply.github.com> Date: Wed, 23 Dec 2020 21:05:09 +0100 Subject: [PATCH 258/272] Fix some typos (#181) --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 095169a61..548124201 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -118,7 +118,7 @@ core: # These translations are used on default extension pages. extension: - confirm_uninstall: Uninstalling will remove all database entires and assets related to the extension. Are you sure you want to contiune? + confirm_uninstall: Uninstalling will remove all database entries and assets related to the extension. Are you sure you want to continue? disabled: Disabled enabled: Enabled enable_to_see: Enable the extension to view and change settings. From 01d8a69dd145fdbca0bb465b93e6e78f64103fed Mon Sep 17 00:00:00 2001 From: Sami Mazouz Date: Tue, 26 Jan 2021 23:09:23 +0100 Subject: [PATCH 259/272] Add bypass tag requirements permission label (#182) --- extensions/lang-english/locale/flarum-tags.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml index f9cfda594..3527507cf 100644 --- a/extensions/lang-english/locale/flarum-tags.yml +++ b/extensions/lang-english/locale/flarum-tags.yml @@ -34,6 +34,7 @@ flarum-tags: # These translations are used in the Permissions page of the admin interface. permissions: allow_edit_tags_label: Allow tag editing + bypass_tag_counts_label: Bypass tag requirements restrict_by_tag_heading: Restrict by Tag tag_discussions_label: Tag discussions From 3ef0c6e2268091b9e86ec8686ed853c804a50a97 Mon Sep 17 00:00:00 2001 From: Qiaeru <22643035+qiaeru@users.noreply.github.com> Date: Tue, 16 Feb 2021 17:39:18 +0100 Subject: [PATCH 260/272] Fix alphabetical order (#184) --- extensions/lang-english/locale/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml index 548124201..bd856878e 100644 --- a/extensions/lang-english/locale/core.yml +++ b/extensions/lang-english/locale/core.yml @@ -120,8 +120,8 @@ core: extension: confirm_uninstall: Uninstalling will remove all database entries and assets related to the extension. Are you sure you want to continue? disabled: Disabled - enabled: Enabled enable_to_see: Enable the extension to view and change settings. + enabled: Enabled info_links: discuss: Discuss documentation: Documentation From b864bc09eff39fc670f6f3dff57dc535dfa95361 Mon Sep 17 00:00:00 2001 From: Robert Korulczyk Date: Tue, 16 Feb 2021 23:40:35 +0100 Subject: [PATCH 261/272] Fix `date_format` message in validation.yml (#152) --- extensions/lang-english/locale/validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml index 14f3ed928..55b9a5a9f 100644 --- a/extensions/lang-english/locale/validation.yml +++ b/extensions/lang-english/locale/validation.yml @@ -18,7 +18,7 @@ validation: confirmed: "The :attribute confirmation does not match." date: "The :attribute is not a valid date." date_equals: "The :attribute must be a date equal to :date." - date_format: "The :attribute does not match the format :other." + date_format: "The :attribute does not match the format :format." different: "The :attribute and :other must be different." digits: "The :attribute must be :digits digits." digits_between: "The :attribute must be between :min and :max digits." From 8dea58eac61d0bd05ce30d00886c2df2447fd7cf Mon Sep 17 00:00:00 2001 From: Robert Korulczyk Date: Wed, 17 Feb 2021 22:26:52 +0100 Subject: [PATCH 262/272] Move locale files from language pack to extensions. (#175) --- extensions/lang-english/locale/.gitkeep | 0 extensions/lang-english/locale/core.yml | 653 ------------------ .../lang-english/locale/flarum-akismet.yml | 22 - .../lang-english/locale/flarum-approval.yml | 37 - .../locale/flarum-auth-facebook.yml | 21 - .../locale/flarum-auth-github.yml | 21 - .../locale/flarum-auth-twitter.yml | 21 - .../lang-english/locale/flarum-emoji.yml | 13 - .../lang-english/locale/flarum-flags.yml | 64 -- .../lang-english/locale/flarum-likes.yml | 37 - .../lang-english/locale/flarum-lock.yml | 37 - .../lang-english/locale/flarum-markdown.yml | 20 - .../lang-english/locale/flarum-mentions.yml | 69 -- .../lang-english/locale/flarum-nicknames.yml | 24 - .../lang-english/locale/flarum-pusher.yml | 23 - .../lang-english/locale/flarum-statistics.yml | 20 - .../lang-english/locale/flarum-sticky.yml | 37 - .../locale/flarum-subscriptions.yml | 80 --- .../lang-english/locale/flarum-suspend.yml | 37 - .../lang-english/locale/flarum-tags.yml | 116 ---- extensions/lang-english/locale/validation.yml | 108 --- 21 files changed, 1460 deletions(-) create mode 100644 extensions/lang-english/locale/.gitkeep delete mode 100644 extensions/lang-english/locale/core.yml delete mode 100644 extensions/lang-english/locale/flarum-akismet.yml delete mode 100644 extensions/lang-english/locale/flarum-approval.yml delete mode 100644 extensions/lang-english/locale/flarum-auth-facebook.yml delete mode 100644 extensions/lang-english/locale/flarum-auth-github.yml delete mode 100644 extensions/lang-english/locale/flarum-auth-twitter.yml delete mode 100644 extensions/lang-english/locale/flarum-emoji.yml delete mode 100644 extensions/lang-english/locale/flarum-flags.yml delete mode 100644 extensions/lang-english/locale/flarum-likes.yml delete mode 100644 extensions/lang-english/locale/flarum-lock.yml delete mode 100644 extensions/lang-english/locale/flarum-markdown.yml delete mode 100644 extensions/lang-english/locale/flarum-mentions.yml delete mode 100644 extensions/lang-english/locale/flarum-nicknames.yml delete mode 100644 extensions/lang-english/locale/flarum-pusher.yml delete mode 100644 extensions/lang-english/locale/flarum-statistics.yml delete mode 100644 extensions/lang-english/locale/flarum-sticky.yml delete mode 100644 extensions/lang-english/locale/flarum-subscriptions.yml delete mode 100644 extensions/lang-english/locale/flarum-suspend.yml delete mode 100644 extensions/lang-english/locale/flarum-tags.yml delete mode 100644 extensions/lang-english/locale/validation.yml diff --git a/extensions/lang-english/locale/.gitkeep b/extensions/lang-english/locale/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/extensions/lang-english/locale/core.yml b/extensions/lang-english/locale/core.yml deleted file mode 100644 index bd856878e..000000000 --- a/extensions/lang-english/locale/core.yml +++ /dev/null @@ -1,653 +0,0 @@ -core: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the admin interface. - admin: - - # These translations are used in the Appearance page. - appearance: - colored_header_label: Colored Header - colors_heading: Colors - colors_text: "Choose two colors to theme your forum with. The first will be used as a highlight color, while the second will be used to style background elements." - custom_footer_heading: Custom Footer - custom_footer_text: => core.ref.custom_footer_text - custom_header_heading: Custom Header - custom_header_text: => core.ref.custom_header_text - custom_styles_heading: Custom Styles - custom_styles_text: Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles. - dark_mode_label: Dark Mode - description: "Customize your forum's colors, logos, and other variables." - edit_css_button: Edit Custom CSS - edit_footer_button: => core.ref.custom_footer_title - edit_header_button: => core.ref.custom_header_title - enter_hex_message: Please enter a hexadecimal color code. - favicon_heading: Favicon - favicon_text: Upload an image to be displayed as the forum's shortcut icon. - logo_heading: Logo - logo_text: Upload an image to be displayed in place of the forum title. - submit_button: => core.ref.save_changes - title: Appearance - - # These translations are used in the Basics page. - basics: - all_discussions_label: => core.ref.all_discussions - default_language_heading: Default Language - description: "Set your forum title, language, and other basic settings." - display_name_heading: User Display Name - display_name_text: Select the driver that should be used for users' display names. By default, the username is shown. - forum_description_heading: Forum Description - forum_description_text: Enter a short sentence or two that describes your community. This will appear in the meta tag and show up in search engines. - forum_title_heading: Forum Title - home_page_heading: Home Page - home_page_text: Choose the page which users will first see when they visit your forum. - saved_message: Your changes were saved. - show_language_selector_label: Show language selector - slug_driver_heading: "Slug Driver: {model}" - slug_driver_text: Select a driver to be used for slugging this model. - submit_button: => core.ref.save_changes - title: Basics - welcome_banner_heading: Welcome Banner - welcome_banner_text: Configure the text that displays in the banner on the All Discussions page. Use this to welcome guests to your forum. - - # These translations are used in the Dashboard page. - dashboard: - clear_cache_button: Clear Cache - description: Your forum at a glance. - title: Dashboard - tools_button: Tools - - # These translations are used in the Edit Custom CSS modal dialog. - edit_css: - customize_text: "Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles." - submit_button: => core.ref.save_changes - title: Edit Custom CSS - - # These translations are used in the Edit Custom Footer modal dialog. - edit_footer: - customize_text: => core.ref.custom_footer_text - submit_button: => core.ref.save_changes - title: => core.ref.custom_footer_title - - # These translations are used in the Edit Group modal dialog. - edit_group: - color_label: => core.ref.color - delete_button: Delete Group - delete_confirmation: "Are you sure you want to delete this group? The group members will NOT be deleted." - hide_label: Hide on forum - icon_label: => core.ref.icon - icon_text: => core.ref.icon_text - name_label: Name - plural_placeholder: Plural (e.g. Mods) - singular_placeholder: Singular (e.g. Mod) - submit_button: => core.ref.save_changes - title: Create Group - - # These translations are used in the Edit Custom Header modal dialog. - edit_header: - customize_text: => core.ref.custom_header_text - submit_button: => core.ref.save_changes - title: => core.ref.custom_header_title - - # These translations are used in the email page of the admin interface. - email: - addresses_heading: Addresses - description: "Configure the driver, settings and addresses your forum will use to send email." - driver_heading: Choose a Driver - driver_label: Driver - from_label: Sender - mail_encryption_label: Encryption - mail_host_label: Host - mail_mailgun_domain_label: Domain - mail_mailgun_region_label: Region - mail_mailgun_secret_label: Secret key - mail_password_label: => core.ref.password - mail_port_label: Port - mail_username_label: => core.ref.username - mailgun_heading: Mailgun Settings - not_sending_message: Flarum currently does not send emails. This can be due to the selected driver, or errors in its configuration. - send_test_mail_button: Send - send_test_mail_heading: Send Test Mail - send_test_mail_success: "Test mail sent successfully!" - send_test_mail_text: "This will send an email using the above configuration to your email, {email}." - smtp_heading: SMTP Settings - submit_button: => core.ref.save_changes - title: => core.ref.email - - # These translations are used on default extension pages. - extension: - confirm_uninstall: Uninstalling will remove all database entries and assets related to the extension. Are you sure you want to continue? - disabled: Disabled - enable_to_see: Enable the extension to view and change settings. - enabled: Enabled - info_links: - discuss: Discuss - documentation: Documentation - donate: Donate - source: Source - support: Support - website: Website - no_permissions: This extension has no permissions. - no_settings: This extension has no settings. - open_modal: Open Settings - permissions_title: Permissions - saved_message: Your changes were saved. - uninstall_button: Uninstall - - # These translations are used in the secondary header. - header: - get_help: Get Help - log_out_button: => core.ref.log_out - - # These translations are used in the modal dialog displayed when loading extensions. - loading: - title: Please Wait... - - # These translations are used in the navigation bar. - nav: - appearance_button: => core.admin.appearance.title - appearance_title: => core.admin.appearance.description - basics_button: => core.admin.basics.title - basics_title: => core.admin.basics.description - categories: - authentication: Authentication - core: Core Configuration - discussion: Discussion - feature: Features - formatting: Formatting - language: Languages - moderation: Moderation - other: Other Extensions - theme: Themes - dashboard_button: => core.admin.dashboard.title - dashboard_title: => core.admin.dashboard.description - email_button: => core.ref.email - email_title: => core.admin.email.description - permissions_button: => core.admin.permissions.title - permissions_title: => core.admin.permissions.description - search_placeholder: Search Extensions - - # These translations are used in the Permissions page of the admin interface. - permissions: - allow_post_editing_label: Allow post editing - allow_renaming_label: Allow renaming - create_heading: Create - delete_discussions_forever_label: Delete discussions forever - delete_discussions_label: Delete discussions - delete_posts_forever_label: Delete posts forever - delete_posts_label: Delete posts - description: Configure who can see and do what. - edit_posts_label: Edit posts - edit_users_label: Edit users - global_heading: Global - moderate_heading: Moderate - new_group_button: New Group - participate_heading: Participate - post_without_throttle_label: Reply multiple times without waiting - read_heading: Read - rename_discussions_label: Rename discussions - reply_to_discussions_label: Reply to discussions - sign_up_label: Sign up - start_discussions_label: Start discussions - title: Permissions - view_discussions_label: View discussions - view_hidden_groups_label: View hidden group badges - view_last_seen_at_label: Always view user last seen time - view_post_ips_label: View post IP addresses - view_user_list_label: View user list - - # These translations are used in the dropdown menus on the Permissions page. - permissions_controls: - allow_indefinitely_button: Indefinitely - allow_some_minutes_button: "For {count} minute|For {count} minutes" - allow_ten_minutes_button: For 10 minutes - allow_until_reply_button: Until next reply - everyone_button: Everyone - members_button: => core.group.members - signup_closed_button: Closed - signup_open_button: Open - - # These translations are used in the Settings modal dialog. - settings: - submit_button: => core.ref.save_changes - - # These translations are used in image upload buttons. - upload_image: - remove_button: => core.ref.remove - upload_button: Choose an Image... - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are used in the Change Email modal dialog. - change_email: - confirm_password_placeholder: => core.ref.confirm_password - confirmation_message: => core.ref.confirmation_email_sent - dismiss_button: => core.ref.okay - incorrect_password_message: The password you entered is incorrect. - submit_button: => core.ref.save_changes - title: => core.ref.change_email - - # These translations are used in the Change Password modal dialog. - change_password: - send_button: Send Password Reset Email - text: Click the button below and check your email for a link to change your password. - title: => core.ref.change_password - - # These translations are used by the composer controls. - composer: - close_tooltip: Close - exit_full_screen_tooltip: Exit Full Screen - full_screen_tooltip: Full Screen - minimize_tooltip: Minimize - preview_tooltip: Preview - - # These translations are used by the composer when starting a discussion. - composer_discussion: - body_placeholder: Write a Post... - discard_confirmation: "You have not posted your discussion. Do you wish to discard it?" - submit_button: Post Discussion - title: => core.ref.start_a_discussion - title_placeholder: Discussion Title - - # These translations are used by the composer when editing a post. - composer_edit: - discard_confirmation: "You have not saved your changes. Do you wish to discard them?" - edited_message: Your edit was made. - post_link: "Post #{number} in {discussion}" - submit_button: => core.ref.save_changes - view_button: => core.ref.view - - # These translations are used by the composer when replying to a discussion. - composer_reply: - body_placeholder: => core.ref.write_a_reply - discard_confirmation: "You have not posted your reply. Do you wish to discard it?" - posted_message: Your reply was posted. - submit_button: Post Reply - view_button: => core.ref.view - - # These translations are used by the discussion control buttons. - discussion_controls: - cannot_reply_button: Can't Reply - cannot_reply_text: You don't have permission to reply to this discussion. - delete_button: => core.ref.delete - delete_confirmation: "Are you sure you want to delete this discussion?" - delete_forever_button: => core.ref.delete_forever - log_in_to_reply_button: Log In to Reply - rename_button: => core.ref.rename - reply_button: => core.ref.reply - restore_button: => core.ref.restore - - # These translations are used in the discussion list. - discussion_list: - empty_text: It looks as though there are no discussions here. - load_more_button: => core.ref.load_more - mark_as_read_tooltip: Mark as Read - replied_text: "{username} replied {ago}" - started_text: "{username} started {ago}" - - # These translations are used in the Edit User modal dialog (admin function). - edit_user: - activate_button: Activate User - email_heading: => core.ref.email - email_label: => core.ref.email - groups_heading: Groups - password_heading: => core.ref.password - password_label: => core.ref.password - set_password_label: Set new password - submit_button: => core.ref.save_changes - title: Edit User - username_heading: => core.ref.username - username_label: => core.ref.username - - # These translations are used in the Forgot Password modal dialog. - forgot_password: - dismiss_button: => core.ref.okay - email_placeholder: => core.ref.email - email_sent_message: We've sent you an email containing a link to reset your password. Check your spam folder if you don't receive it within the next minute or two. - not_found_message: There is no user registered with that email address. - submit_button: Recover Password - text: Enter your email address and we will send you a link to reset your password. - title: Forgot Password - - # These translations are used in the header and session dropdown menu. - header: - admin_button: Administration - back_to_index_tooltip: Back to Discussion List - log_in_link: => core.ref.log_in - log_out_button: => core.ref.log_out - profile_button: Profile - search_placeholder: Search Forum - settings_button: => core.ref.settings - sign_up_link: => core.ref.sign_up - - # These translations are used on the index page, peripheral to the discussion list. - index: - all_discussions_link: => core.ref.all_discussions - cannot_start_discussion_button: Can't Start Discussion - mark_all_as_read_confirmation: "Are you sure you want to mark all discussions as read?" - mark_all_as_read_tooltip: => core.ref.mark_all_as_read - meta_title_text: => core.ref.all_discussions - refresh_tooltip: Refresh - start_discussion_button: => core.ref.start_a_discussion - - # These translations are used by the sorting control above the discussion list. - index_sort: - latest_button: Latest - newest_button: Newest - oldest_button: Oldest - relevance_button: Relevance - top_button: Top - - # These translations are used in the Log In modal dialog. - log_in: - forgot_password_link: "Forgot password?" - invalid_login_message: Your login details were incorrect. - password_placeholder: => core.ref.password - remember_me_label: Remember Me - sign_up_text: "Don't have an account? Sign Up" - submit_button: => core.ref.log_in - title: => core.ref.log_in - username_or_email_placeholder: Username or Email - - # These translations are used by the Notifications dropdown, a.k.a. "the bell". - notifications: - discussion_renamed_text: "{username} changed the title" - empty_text: No Notifications - mark_all_as_read_tooltip: => core.ref.mark_all_as_read - mark_as_read_tooltip: Mark as Read - title: => core.ref.notifications - tooltip: => core.ref.notifications - - # These translations are used by tooltips displayed for individual posts. - post: - edited_text: Edited - edited_tooltip: "{username} edited {ago}" - number_tooltip: "Post #{number}" - - # These translations are used by the post control buttons. - post_controls: - delete_button: => core.ref.delete - delete_confirmation: "Are you sure you want to delete this post forever? This action cannot be undone." - delete_forever_button: => core.ref.delete_forever - edit_button: => core.ref.edit - hide_confirmation: "Are you sure you want to delete this post?" - restore_button: => core.ref.restore - - # These translations are used in the scrubber to the right of the post stream. - post_scrubber: - now_link: Now - original_post_link: Original Post - unread_text: "{count} unread" - viewing_text: "{index} of {count} post|{index} of {count} posts" - - # These translations are displayed between posts in the post stream. - post_stream: - discussion_renamed_old_tooltip: 'The old title was: "{old}"' - discussion_renamed_text: "{username} changed the title to {new}." - load_more_button: => core.ref.load_more - reply_placeholder: => core.ref.write_a_reply - time_lapsed_text: "{period} later" - - # These translations are used by the rename discussion modal. - rename_discussion: - submit_button: => core.ref.rename - title: Rename Discussion - - # These translations are used by the search results dropdown list. - search: - all_discussions_button: 'Search all discussions for "{query}"' - discussions_heading: => core.ref.discussions - users_heading: => core.ref.users - - # These translations are used in the Settings page. - settings: - account_heading: Account - change_email_button: => core.ref.change_email - change_password_button: => core.ref.change_password - notifications_heading: => core.ref.notifications - notify_by_email_heading: => core.ref.email - notify_by_web_heading: Web - notify_discussion_renamed_label: Someone renames a discussion I started - privacy_disclose_online_label: Allow others to see when I am online - privacy_heading: Privacy - title: => core.ref.settings - - # These translations are used in the Sign Up modal dialog. - sign_up: - dismiss_button: => core.ref.okay - email_placeholder: => core.ref.email - log_in_text: "Already have an account? Log In" - password_placeholder: => core.ref.password - submit_button: => core.ref.sign_up - title: => core.ref.sign_up - username_placeholder: => core.ref.username - welcome_text: "Welcome, {username}!" - - # These translations are used in the user profile page and profile popup. - user: - avatar_remove_button: => core.ref.remove - avatar_upload_button: Upload - avatar_upload_tooltip: Upload a new avatar - discussions_link: => core.ref.discussions - in_discussion_text: "In {discussion}" - joined_date_text: "Joined {ago}" - online_text: Online - posts_empty_text: It looks like there are no posts here. - posts_link: => core.ref.posts - posts_load_more_button: => core.ref.load_more - settings_link: => core.ref.settings - - # These translations are found on the user profile page (admin function). - user_controls: - button: Controls - delete_button: => core.ref.delete - delete_confirmation: "Are you sure you want to delete this user? The user's posts will NOT be deleted." - delete_error_message: "Deletion of user {username} ({email}) failed" - delete_success_message: "User {username} ({email}) was deleted" - edit_button: => core.ref.edit - - # These translations are used in the alert that is shown when a new user has not confirmed their email address. - user_email_confirmation: - alert_message: => core.ref.confirmation_email_sent - resend_button: Resend Confirmation Email - sent_message: Sent - - # Translations in this namespace are used by the forum and admin interfaces. - lib: - - # These translations are displayed as tooltips for discussion badges. - badge: - hidden_tooltip: Hidden - - # These translations are displayed as error messages. - error: - dependent_extensions_message: "Cannot disable {extension} until the following dependent extensions are disabled: {extensions}" - generic_message: "Oops! Something went wrong. Please reload the page and try again." - missing_dependencies_message: "Cannot enable {extension} until the following dependencies are enabled: {extensions}" - not_found_message: The requested resource was not found. - permission_denied_message: You do not have permission to do that. - rate_limit_exceeded_message: You're going a little too quickly. Please try again in a few seconds. - - # These translations are used as suffixes when abbreviating numbers. - number_suffix: - kilo_text: K - mega_text: M - - # These translations are used to punctuate a series of items. - series: - glue_text: ", " - three_text: "{first}, {second}, and {third}" - two_text: "{first} and {second}" - - # These translations are used to modify usernames. - username: - deleted_text: "[deleted]" - - # Translations in this namespace are used in views other than Flarum's normal JS client. - views: - - # Translations in this namespace are displayed by the basic HTML content loader. - content: - javascript_disabled_message: This site is best viewed in a modern browser with JavaScript enabled. - load_error_message: Something went wrong while trying to load the full version of this site. Try hard-refreshing this page to fix the error. - loading_text: Loading... - - # Translations in this namespace are displayed in the basic HTML discussion view. - discussion: - next_page_button: => core.ref.next_page - previous_page_button: => core.ref.previous_page - - # Translations in this namespace are displayed when Flarum encounters an error. - error: - csrf_token_mismatch: You have been inactive for too long. - csrf_token_mismatch_return_link: Go back, to try again - invalid_confirmation_token: This confirmation link has already been used or is invalid. - not_authenticated: You do not have permission to access this page. Try again after logging in. - not_found: The page you requested could not be found. - not_found_return_link: "Return to {forum}" - permission_denied: You do not have permission to access this page. - unknown: An error occurred while trying to load this page. - - # Translations in this namespace are displayed by the basic HTML discussion index. - index: - all_discussions_heading: => core.ref.all_discussions - next_page_button: => core.ref.next_page - previous_page_button: => core.ref.previous_page - - # Translations in this namespace are displayed by the Log Out confirmation interface. - log_out: - log_out_button: => core.ref.log_out - log_out_confirmation: "Are you sure you want to log out of {forum}?" - title: => core.ref.log_out - - # Translations in this namespace are displayed by the Reset Password interface. - reset_password: - confirm_password_label: Confirm New Password - new_password_label: New Password - submit_button: => core.ref.save_changes - title: => core.ref.reset_your_password - - # Translations in this namespace are used in messages output by the API. - api: - invalid_username_message: "The username may only contain letters, numbers, and dashes." - - # Translations in this namespace are used in emails sent by the forum. - email: - - # These translations are used in emails sent when users register new accounts. - activate_account: - subject: Activate Your New Account - body: | - Hey {username}! - - Someone (hopefully you!) has signed up to {forum} with this email address. - - If this was you, simply click the following link and your account will be activated: - {url} - - If you did not sign up, please ignore this email. - - # These translations are used in emails sent when users change their email address. - confirm_email: - subject: Confirm Your New Email Address - body: | - Hey {username}! - - Someone (hopefully you!) has changed their email address on {forum} to this one. - - If this was you, simply click the following link and your email will be confirmed: - {url} - - If this was not you, please ignore this email. - - # These translations are used in emails sent when users ask to reset their passwords. - reset_password: - subject: => core.ref.reset_your_password - body: | - Hey {username}! - - Someone (hopefully you!) has submitted a forgotten password request for your account on {forum}. - - If this was you, click the following link to reset your password: - {url} - - If you do not wish to change your password, just ignore this email and nothing will happen. - - # These translations are used when testing mailing configuration - send_test: - subject: Flarum Email Test - body: | - Hey {username}! - - This is a test email to confirm that your Flarum email configuration is working properly. - - If this was you, this email means that your configuration works! - - If this was not you, please ignore this email. - - ## - # REUSED TRANSLATIONS - These keys should not be used directly in code! - ## - - # Translations in this namespace are referenced by two or more unique keys. - ref: - all_discussions: All Discussions - change_email: Change Email - change_password: Change Password - color: Color # Referenced by flarum-tags.yml - confirm_password: Confirm Password - confirmation_email_sent: "We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." - custom_footer_text: Add HTML to be displayed at the very bottom of the page. - custom_footer_title: Edit Custom Footer - custom_header_text: "Add HTML to be displayed at the very top of the page, above Flarum's own header." - custom_header_title: Edit Custom Header - delete: Delete - delete_forever: Delete Forever - discussions: Discussions # Referenced by flarum-statistics.yml - edit: Edit - email: Email - icon: Icon - icon_text: "Enter the name of any FontAwesome icon class, including the fas fa- prefix." - load_more: Load More - log_in: Log In - log_out: Log Out - mark_all_as_read: Mark All as Read - next_page: Next Page - notifications: Notifications - okay: OK # Referenced by flarum-tags.yml - password: Password - posts: Posts # Referenced by flarum-statistics.yml - previous_page: Previous Page - remove: Remove - rename: Rename - reply: Reply # Referenced by flarum-mentions.yml - reset_your_password: Reset Your Password - restore: Restore - save_changes: Save Changes # Referenced by flarum-suspend.yml, flarum-tags.yml - settings: Settings - sign_up: Sign Up - some_others: "{count} other|{count} others" # Referenced by flarum-likes.yml, flarum-mentions.yml - start_a_discussion: Start a Discussion - username: Username - users: Users # Referenced by flarum-statistics.yml - view: View - write_a_reply: Write a Reply... - you: You # Referenced by flarum-likes.yml, flarum-mentions.yml - - ## - # GROUP NAMES - These keys are translated at the back end. - ## - - # Translations in this namespace are used to translate default group names. - group: - admin: Admin - admins: Admins - guest: Guest - guests: Guests - member: Member - members: Members - mod: Mod - mods: Mods diff --git a/extensions/lang-english/locale/flarum-akismet.yml b/extensions/lang-english/locale/flarum-akismet.yml deleted file mode 100644 index 861348177..000000000 --- a/extensions/lang-english/locale/flarum-akismet.yml +++ /dev/null @@ -1,22 +0,0 @@ -flarum-akismet: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the admin interface. - admin: - - # These translations are used in the Akismet Settings modal dialog. - akismet_settings: - api_key_label: API Key - title: Akismet Settings - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are used by the frame displayed around flagged posts. - post: - akismet_flagged_text: Akismet flagged as spam - not_spam_button: Not Spam - diff --git a/extensions/lang-english/locale/flarum-approval.yml b/extensions/lang-english/locale/flarum-approval.yml deleted file mode 100644 index 55c631ae2..000000000 --- a/extensions/lang-english/locale/flarum-approval.yml +++ /dev/null @@ -1,37 +0,0 @@ -flarum-approval: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the admin interface. - admin: - - # These translations are used in the Permissions page of the admin interface. - permissions: - approve_posts_label: Approve posts - reply_without_approval_label: Reply to discussions without approval - start_discussions_without_approval_label: Start discussions without approval - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are displayed as tooltips for discussion badges. - badge: - awaiting_approval_tooltip: => flarum-approval.ref.awaiting_approval - - # These translations are displayed in the post header. - post: - awaiting_approval_text: => flarum-approval.ref.awaiting_approval - - # These translations are used by the post control buttons. - post_controls: - approve_button: Approve - - ## - # REUSED TRANSLATIONS - These keys should not be used directly in code! - ## - - # Translations in this namespace are referenced by two or more unique keys. - ref: - awaiting_approval: Awaiting approval diff --git a/extensions/lang-english/locale/flarum-auth-facebook.yml b/extensions/lang-english/locale/flarum-auth-facebook.yml deleted file mode 100644 index 89f7ef772..000000000 --- a/extensions/lang-english/locale/flarum-auth-facebook.yml +++ /dev/null @@ -1,21 +0,0 @@ -flarum-auth-facebook: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the admin interface. - admin: - - # These translations are used in the Facebook Settings modal dialog. - facebook_settings: - app_id_label: App ID - app_secret_label: App Secret - title: Facebook Settings - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are used in the Log In modal dialog. - log_in: - with_facebook_button: Log In with Facebook diff --git a/extensions/lang-english/locale/flarum-auth-github.yml b/extensions/lang-english/locale/flarum-auth-github.yml deleted file mode 100644 index 593379f61..000000000 --- a/extensions/lang-english/locale/flarum-auth-github.yml +++ /dev/null @@ -1,21 +0,0 @@ -flarum-auth-github: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the admin interface. - admin: - - # These translations are used in the GitHub Settings modal dialog. - github_settings: - client_id_label: Client ID - client_secret_label: Client Secret - title: GitHub Settings - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are used in the Log In modal dialog. - log_in: - with_github_button: Log In with GitHub diff --git a/extensions/lang-english/locale/flarum-auth-twitter.yml b/extensions/lang-english/locale/flarum-auth-twitter.yml deleted file mode 100644 index a5894d043..000000000 --- a/extensions/lang-english/locale/flarum-auth-twitter.yml +++ /dev/null @@ -1,21 +0,0 @@ -flarum-auth-twitter: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the admin interface. - admin: - - # These translations are used in the Twitter Settings modal dialog. - twitter_settings: - api_key_label: API Key - api_secret_label: API Secret - title: Twitter Settings - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are used in the Log In modal dialog. - log_in: - with_twitter_button: Log In with Twitter diff --git a/extensions/lang-english/locale/flarum-emoji.yml b/extensions/lang-english/locale/flarum-emoji.yml deleted file mode 100644 index a7d29de51..000000000 --- a/extensions/lang-english/locale/flarum-emoji.yml +++ /dev/null @@ -1,13 +0,0 @@ -flarum-emoji: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are used by the composer (emoji autocompletion function). - composer: - emoji_tooltip: Insert emoji - type_to_search_text: Type to search for an emoji diff --git a/extensions/lang-english/locale/flarum-flags.yml b/extensions/lang-english/locale/flarum-flags.yml deleted file mode 100644 index 680e1ab0e..000000000 --- a/extensions/lang-english/locale/flarum-flags.yml +++ /dev/null @@ -1,64 +0,0 @@ -flarum-flags: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the admin interface. - admin: - - # These translations are used in the Permissions page of the admin interface. - permissions: - flag_posts_label: Flag posts - view_flags_label: View flagged posts - - # These translations are used in the Flags Settings modal dialog. - settings: - flag_own_posts_label: Allow users to flag their own posts - guidelines_url_label: Community Guidelines URL - title: Flags Settings - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are used by the Flag Post modal dialog. - flag_post: - confirmation_message: Thank you for flagging this post. Our moderators will look into it. - dismiss_button: => core.ref.okay - reason_details_placeholder: Additional details (optional) - reason_inappropriate_label: Inappropriate - reason_inappropriate_text: "This post is offensive, abusive, or violates our community guidelines." - reason_missing_message: Please provide some details for our moderators. - reason_off_topic_label: "Off-topic" - reason_off_topic_text: This post is not relevant to the current discussion and should be moved elsewhere. - reason_other_label: Other (please specify) - reason_spam_label: Spam - reason_spam_text: This post is an advertisement. - submit_button: => flarum-flags.ref.flag_post - title: => flarum-flags.ref.flag_post - - # These translations are used by the Flagged Posts dropdown, a.k.a. "the flag". - flagged_posts: - empty_text: No Flags - item_text: "{username} in {discussion}" - title: => flarum-flags.ref.flagged_posts - tooltip: => flarum-flags.ref.flagged_posts - - # These translations are used by the frame displayed around flagged posts. - post: - dismiss_flag_button: Dismiss Flag - flagged_by_text: "Flagged by {username}" - flagged_by_with_reason_text: "Flagged by {username} as {reason}" - - # These translations are used by the post control buttons. - post_controls: - flag_button: Flag - - ## - # REUSED TRANSLATIONS - These keys should not be used directly in code! - ## - - # Translations in this namespace are referenced by two or more unique keys. - ref: - flag_post: Flag Post - flagged_posts: Flagged Posts diff --git a/extensions/lang-english/locale/flarum-likes.yml b/extensions/lang-english/locale/flarum-likes.yml deleted file mode 100644 index b723b35ee..000000000 --- a/extensions/lang-english/locale/flarum-likes.yml +++ /dev/null @@ -1,37 +0,0 @@ -flarum-likes: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the admin interface. - admin: - - # These translations are used in the Permissions page of the admin interface. - permissions: - like_posts_label: Like posts - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are used by the Notifications dropdown, a.k.a. "the bell". - notifications: - others_text: => core.ref.some_others - post_liked_text: "{username} liked your post" # Can be pluralized to agree with the number of users! - - # These translations are displayed beneath individual posts. - post: - like_link: Like - liked_by_self_text: "{users} like this." # Can be pluralized to agree with the number of users! - liked_by_text: "{users} likes this.|{users} like this." - others_link: => core.ref.some_others - unlike_link: Unlike - you_text: => core.ref.you - - # These translations are used by the Users Who Like This modal dialog. - post_likes: - title: Users Who Like This - - # These translations are used in the Settings page. - settings: - notify_post_liked_label: Someone likes one of my posts diff --git a/extensions/lang-english/locale/flarum-lock.yml b/extensions/lang-english/locale/flarum-lock.yml deleted file mode 100644 index 2f80ec264..000000000 --- a/extensions/lang-english/locale/flarum-lock.yml +++ /dev/null @@ -1,37 +0,0 @@ -flarum-lock: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the admin interface. - admin: - - # These translations are used in the Permissions page of the admin interface. - permissions: - lock_discussions_label: Lock discussions - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are displayed as tooltips for discussion badges. - badge: - locked_tooltip: Locked - - # These translations are used by the discussion control buttons. - discussion_controls: - lock_button: Lock - unlock_button: Unlock - - # These translations are used by the Notifications dropdown, a.k.a. "the bell". - notifications: - discussion_locked_text: "{username} locked" - - # These translations are displayed between posts in the post stream. - post_stream: - discussion_locked_text: "{username} locked the discussion." - discussion_unlocked_text: "{username} unlocked the discussion." - - # These translations are used in the Settings page. - settings: - notify_discussion_locked_label: Someone locks a discussion I started diff --git a/extensions/lang-english/locale/flarum-markdown.yml b/extensions/lang-english/locale/flarum-markdown.yml deleted file mode 100644 index dd4ad1666..000000000 --- a/extensions/lang-english/locale/flarum-markdown.yml +++ /dev/null @@ -1,20 +0,0 @@ -flarum-markdown: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are used by the composer (emoji autocompletion function). - composer: - bold_tooltip: Add bold text - code_tooltip: Insert code - header_tooltip: Add header text - image_tooltip: Add an image - italic_tooltip: Add italic text - link_tooltip: Add a link - ordered_list_tooltip: Add a numbered list - quote_tooltip: Insert a quote - unordered_list_tooltip: Add a bulleted list diff --git a/extensions/lang-english/locale/flarum-mentions.yml b/extensions/lang-english/locale/flarum-mentions.yml deleted file mode 100644 index a46a07950..000000000 --- a/extensions/lang-english/locale/flarum-mentions.yml +++ /dev/null @@ -1,69 +0,0 @@ -flarum-mentions: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are used by the composer (reply autocompletion function). - composer: - mention_tooltip: Mention a user or post - reply_to_post_text: "Reply to #{number}" - - # These translations are used by the Notifications dropdown, a.k.a. "the bell". - notifications: - others_text: => core.ref.some_others - post_mentioned_text: "{username} replied to your post" # Can be pluralized to agree with the number of users! - user_mentioned_text: "{username} mentioned you" - - # These translations are displayed beneath individual posts. - post: - mentioned_by_self_text: "{users} replied to this." # Can be pluralized to agree with the number of users! - mentioned_by_text: "{users} replied to this." # Can be pluralized to agree with the number of users! - others_text: => core.ref.some_others - quote_button: Quote - reply_link: => core.ref.reply - you_text: => core.ref.you - - # These translations are used in the Settings page. - settings: - notify_post_mentioned_label: Someone replies to one of my posts - notify_user_mentioned_label: Someone mentions me in a post - - # These translations are used in the user profile page and profile popup. - user: - mentions_link: Mentions - - # Translations in this namespace are used in emails sent by the forum. - email: - - # These translations are used in emails sent when a post is replied to - post_mentioned: - subject: "{replier_display_name} replied to your post in {title}" - body: | - Hey {recipient_display_name}! - - {replier_display_name} replied to your post (#{post_number}) in {title}. - - {url} - - --- - - {content} - - # These translations are used in emails sent when a user is mentioned - user_mentioned: - subject: "{mentioner_display_name} mentioned you in {title}" - body: | - Hey {recipient_display_name}! - - {mentioner_display_name} mentioned you in a post in {title}. - - {url} - - --- - - {content} - diff --git a/extensions/lang-english/locale/flarum-nicknames.yml b/extensions/lang-english/locale/flarum-nicknames.yml deleted file mode 100644 index 5053368ae..000000000 --- a/extensions/lang-english/locale/flarum-nicknames.yml +++ /dev/null @@ -1,24 +0,0 @@ -flarum-nicknames: - admin: - permissions: - edit_own_nickname_label: Edit own nickname - settings: - max_label: Maximum nickname length - min_label: Minimum nickname length - regex_label: Regular expression for validation - unique_label: Require unique nicknames? - wrong_driver: You must select "nickname" as the display name driver on the Basics Page for this extension to take effect. - api: - invalid_nickname_message: This nickname is invalid. Please contact your forum administrator for more information on nickname rules. - forum: - change_nickname: - submit_button: => core.ref.save_changes - title: => flarum-nicknames.ref.change_nickname - edit_user: - nicknames_heading: => flarum-nicknames.ref.change_nickname - nicknames_text: Nickname - settings: - change_nickname_button: => flarum-nicknames.ref.change_nickname - - ref: - change_nickname: Change Nickname diff --git a/extensions/lang-english/locale/flarum-pusher.yml b/extensions/lang-english/locale/flarum-pusher.yml deleted file mode 100644 index 184489bc2..000000000 --- a/extensions/lang-english/locale/flarum-pusher.yml +++ /dev/null @@ -1,23 +0,0 @@ -flarum-pusher: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the admin interface. - admin: - - # These translations are used in the Pusher Settings modal dialog. - pusher_settings: - app_cluster_label: Cluster - app_id_label: App ID - app_key_label: App Key - app_secret_label: App Secret - title: Pusher Settings - - # Translations in this namespace are used by the admin interface. - forum: - - # These translations are used in the discussion list. - discussion_list: - show_updates_text: "Show {count} updated discussion|Show {count} updated discussions" diff --git a/extensions/lang-english/locale/flarum-statistics.yml b/extensions/lang-english/locale/flarum-statistics.yml deleted file mode 100644 index 4cadaf7ac..000000000 --- a/extensions/lang-english/locale/flarum-statistics.yml +++ /dev/null @@ -1,20 +0,0 @@ -flarum-statistics: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the admin interface. - admin: - - # These translations are used in the Statistics dashboard widget. - statistics: - active_users_text: "{count} active" - discussions_heading: => core.ref.discussions - last_12_months_label: Last 12 months - last_28_days_label: Last 28 days - last_7_days_label: Last 7 days - posts_heading: => core.ref.posts - today_label: Today - total_label: Total - users_heading: => core.ref.users diff --git a/extensions/lang-english/locale/flarum-sticky.yml b/extensions/lang-english/locale/flarum-sticky.yml deleted file mode 100644 index 850bc88bf..000000000 --- a/extensions/lang-english/locale/flarum-sticky.yml +++ /dev/null @@ -1,37 +0,0 @@ -flarum-sticky: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the admin interface. - admin: - - # These translations are used in the Permissions page of the admin interface. - permissions: - sticky_discussions_label: Sticky discussions - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are displayed as tooltips for discussion badges. - badge: - sticky_tooltip: => flarum-sticky.ref.sticky - - # These translations are used by the discussion control buttons. - discussion_controls: - sticky_button: => flarum-sticky.ref.sticky - unsticky_button: Unsticky - - # These translations are displayed between posts in the post stream. - post_stream: - discussion_stickied_text: "{username} stickied the discussion." - discussion_unstickied_text: "{username} unstickied the discussion." - - ## - # REUSED TRANSLATIONS - These keys should not be used directly in code! - ## - - # Translations in this namespace are referenced by two or more unique keys. - ref: - sticky: Sticky diff --git a/extensions/lang-english/locale/flarum-subscriptions.yml b/extensions/lang-english/locale/flarum-subscriptions.yml deleted file mode 100644 index f1159f74e..000000000 --- a/extensions/lang-english/locale/flarum-subscriptions.yml +++ /dev/null @@ -1,80 +0,0 @@ -flarum-subscriptions: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are displayed as tooltips for discussion badges. - badge: - following_tooltip: => flarum-subscriptions.ref.following - ignoring_tooltip: => flarum-subscriptions.ref.ignoring - - # These translations are used by the discussion control buttons. - discussion_controls: - follow_button: => flarum-subscriptions.ref.follow - unfollow_button: Unfollow - unignore_button: Unignore - - # These translations are used on the page that displays all subscriptions. - following: - meta_title_text: => flarum-subscriptions.ref.following - - # These translations are used on the index page, peripheral to the discussion list. - index: - following_link: => flarum-subscriptions.ref.following - - # These translations are used by the Notifications dropdown, a.k.a. "the bell". - notifications: - new_post_text: "{username} posted" - - # These translations are used in the Settings page. - settings: - follow_after_reply_label: Automatically follow discussions that I reply to - notify_new_post_label: Someone posts in a discussion I'm following - - # These translations are used in the subscription menu displayed to the right of the post stream. - sub_controls: - follow_button: => flarum-subscriptions.ref.follow - following_button: => flarum-subscriptions.ref.following - following_text: Be notified of all replies. - ignoring_button: => flarum-subscriptions.ref.ignoring - ignoring_text: Never be notified. Hide from the discussion list. - not_following_button: Not Following - not_following_text: "Be notified only when @mentioned." - notify_alert_tooltip: Get a forum notification when there are new posts - notify_email_tooltip: Get an email when there are new posts - - # Translations in this namespace are used in emails sent by the forum. - email: - - # These translations are used in emails sent when a post is made in a subscribed discussion - new_post: - subject: "[New Post] {title}" - body: | - Hey {recipient_display_name}! - - {poster_display_name} made a post in a discussion you're following: {title}. - - To view the new activity, check out the following link: - {url} - - --- - - {content} - - --- - - You won't receive any more notifications about this discussion until you're up-to-date. - - ## - # REUSED TRANSLATIONS - These keys should not be used directly in code! - ## - - # Translations in this namespace are referenced by two or more unique keys. - ref: - follow: Follow - following: Following - ignoring: Ignoring diff --git a/extensions/lang-english/locale/flarum-suspend.yml b/extensions/lang-english/locale/flarum-suspend.yml deleted file mode 100644 index 55ae520b8..000000000 --- a/extensions/lang-english/locale/flarum-suspend.yml +++ /dev/null @@ -1,37 +0,0 @@ -flarum-suspend: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the admin interface. - admin: - - # These translations are used in the Permissions page of the admin interface. - permissions: - suspend_users_label: Suspend users - - # Translations in this namespace are used by the forum user interface. - forum: - # These translations are used in the suspension notifications - notifications: - user_suspended_text: "{username} suspended you for {timeReadable}" - user_unsuspended_text: "{username} unsuspended you" - - # These translations are used in the Suspend User modal dialog (admin function). - suspend_user: - indefinitely_label: Suspended indefinitely - limited_time_days_text: " days" - limited_time_label: Suspended for a limited time... - not_suspended_label: Not suspended - status_heading: Suspension Status - submit_button: => core.ref.save_changes - title: "Suspend {username}" - - # These translations are displayed as tooltips for user badges. - user_badge: - suspended_tooltip: Suspended - - # These translations are found on the user profile page (admin function). - user_controls: - suspend_button: Suspend diff --git a/extensions/lang-english/locale/flarum-tags.yml b/extensions/lang-english/locale/flarum-tags.yml deleted file mode 100644 index 3527507cf..000000000 --- a/extensions/lang-english/locale/flarum-tags.yml +++ /dev/null @@ -1,116 +0,0 @@ -flarum-tags: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the admin interface. - admin: - - # These translations are used in the Basics page. - basics: - tags_label: => flarum-tags.ref.tags - - # These translations are used in the Edit Tag modal dialog. - edit_tag: - color_label: => core.ref.color - delete_tag_button: Delete Tag - delete_tag_confirmation: "Are you sure you want to delete this tag? The tag's discussions will NOT be deleted." - description_label: Description - hide_label: Hide from All Discussions - icon_label: => core.ref.icon - icon_text: => core.ref.icon_text - name_label: => flarum-tags.ref.name - name_placeholder: => flarum-tags.ref.name - slug_label: Slug - submit_button: => core.ref.save_changes - title: Create Tag - - # These translations are used in the navigation bar. - nav: - tags_button: => flarum-tags.ref.tags - tags_text: Manage the list of tags available to organise discussions with. - - # These translations are used in the Permissions page of the admin interface. - permissions: - allow_edit_tags_label: Allow tag editing - bypass_tag_counts_label: Bypass tag requirements - restrict_by_tag_heading: Restrict by Tag - tag_discussions_label: Tag discussions - - # These translations are used in the Tag Settings modal dialog. - tag_settings: - range_separator_text: " to " - required_primary_heading: Required Number of Primary Tags - required_primary_text: Enter the minimum and maximum number of primary tags that may be applied to a discussion. - required_secondary_heading: Required Number of Secondary Tags - required_secondary_text: Enter the minimum and maximum number of secondary tags that may be applied to a discussion. - title: Tag Settings - - # These translations are used in the Tags page. - tags: - about_tags_text: "Tags are used to categorize discussions. Primary tags are like traditional forum categories: they can be arranged in a two-level hierarchy. Secondary tags do not have hierarchy or order, and are useful for micro-categorization." - create_primary_tag_button: Create Primary Tag - create_secondary_tag_button: Create Secondary Tag - primary_heading: Primary Tags - secondary_heading: Secondary Tags - settings_heading: Settings - - # Translations in this namespace are used by the forum user interface. - forum: - - # These translations are displayed on the page that lists all tags. - all_tags: - meta_description_text: All Tags - meta_title_text: => flarum-tags.ref.tags - - # These translations are used by the Choose Tags modal dialog. - choose_tags: - choose_primary_placeholder: "Choose a primary tag|Choose {count} primary tags" - choose_secondary_placeholder: "Choose 1 more tag|Choose {count} more tags" - edit_title: "Edit Tags for {title}" - submit_button: => core.ref.okay - title: Choose Tags for Your Discussion - - # These translations are used by the composer when starting a discussion. - composer_discussion: - choose_tags_link: Choose Tags - - # These translations are used by the discussion control buttons. - discussion_controls: - edit_tags_button: Edit Tags - - header: - back_to_tags_tooltip: Back to Tag List - - # These translations are used on the index page, peripheral to the discussion list. - index: - more_link: More... - tags_link: => flarum-tags.ref.tags - untagged_link: Untagged - - # These translations are displayed between posts in the post stream. - post_stream: - added_and_removed_tags_text: "{username} added the {tagsAdded} and removed the {tagsRemoved}." - added_tags_text: "{username} added the {tagsAdded}." - removed_tags_text: "{username} removed the {tagsRemoved}." - tags_text: "{tags} tag|{tags} tags" - - # These translations are used when visiting a single tag's discussion list. - tag: - meta_description_text: "All discussions with the {tag} tag" - - # Translations in this namespace are used by the forum and admin interfaces. - lib: - - # This translation is displayed in place of the name of a tag that's been deleted. - deleted_tag_text: Deleted - - ## - # REUSED TRANSLATIONS - These keys should not be used directly in code! - ## - - # Translations in this namespace are referenced by two or more unique keys. - ref: - name: Name - tags: Tags diff --git a/extensions/lang-english/locale/validation.yml b/extensions/lang-english/locale/validation.yml deleted file mode 100644 index 55b9a5a9f..000000000 --- a/extensions/lang-english/locale/validation.yml +++ /dev/null @@ -1,108 +0,0 @@ -validation: - accepted: "The :attribute must be accepted." - active_url: "The :attribute is not a valid URL." - after: "The :attribute must be a date after :date." - after_or_equal: "The :attribute must be a date after or equal to :date." - alpha: "The :attribute may only contain letters." - alpha_dash: "The :attribute may only contain letters, numbers, dashes and underscores." - alpha_num: "The :attribute may only contain letters and numbers." - array: "The :attribute must be an array." - before: "The :attribute must be a date before :date." - before_or_equal: "The :attribute must be a date before or equal to :date." - between: - numeric: "The :attribute must be between :min and :max." - file: "The :attribute must be between :min and :max kilobytes." - string: "The :attribute must be between :min and :max characters." - array: "The :attribute must have between :min and :max items." - boolean: "The :attribute field must be true or false." - confirmed: "The :attribute confirmation does not match." - date: "The :attribute is not a valid date." - date_equals: "The :attribute must be a date equal to :date." - date_format: "The :attribute does not match the format :format." - different: "The :attribute and :other must be different." - digits: "The :attribute must be :digits digits." - digits_between: "The :attribute must be between :min and :max digits." - dimensions: "The :attribute has invalid image dimensions." - distinct: "The :attribute field has a duplicate value." - email: "The :attribute must be a valid email address." - ends_with: "The :attribute must end with one of the following: :values." - exists: "The selected :attribute is invalid." - file: "The :attribute must be a file." - filled: "The :attribute field must have a value." - gt: - numeric: "The :attribute must be greater than :value." - file: "The :attribute must be greater than :value kilobytes." - string: "The :attribute must be greater than :value characters." - array: "The :attribute must have more than :value items." - gte: - numeric: "The :attribute must be greater than or equal :value." - file: "The :attribute must be greater than or equal :value kilobytes." - string: "The :attribute must be greater than or equal :value characters." - array: "The :attribute must have :value items or more." - image: "The :attribute must be an image." - in: "The selected :attribute is invalid." - in_array: "The :attribute field does not exist in :other." - integer: "The :attribute must be an integer." - ip: "The :attribute must be a valid IP address." - ipv4: "The :attribute must be a valid IPv4 address." - ipv6: "The :attribute must be a valid IPv6 address." - json: "The :attribute must be a valid JSON string." - lt: - numeric: "The :attribute must be less than :value." - file: "The :attribute must be less than :value kilobytes." - string: "The :attribute must be less than :value characters." - array: "The :attribute must have less than :value items." - lte: - numeric: "The :attribute must be less than or equal :value." - file: "The :attribute must be less than or equal :value kilobytes." - string: "The :attribute must be less than or equal :value characters." - array: "The :attribute must not have more than :value items." - max: - numeric: "The :attribute may not be greater than :max." - file: "The :attribute may not be greater than :max kilobytes." - string: "The :attribute may not be greater than :max characters." - array: "The :attribute may not have more than :max items." - mimes: "The :attribute must be a file of type: :values." - mimetypes: "The :attribute must be a file of type: :values." - min: - numeric: "The :attribute must be at least :min." - file: "The :attribute must be at least :min kilobytes." - string: "The :attribute must be at least :min characters." - array: "The :attribute must have at least :min items." - not_in: "The selected :attribute is invalid." - not_regex: "The :attribute format is invalid." - numeric: "The :attribute must be a number." - password: "The password is incorrect." - present: "The :attribute field must be present." - regex: "The :attribute format is invalid." - required: "The :attribute field is required." - required_if: "The :attribute field is required when :other is :value." - required_unless: "The :attribute field is required unless :other is in :values." - required_with: "The :attribute field is required when :values is present." - required_with_all: "The :attribute field is required when :values are present." - required_without: "The :attribute field is required when :values is not present." - required_without_all: "The :attribute field is required when none of :values are present." - same: "The :attribute and :other must match." - size: - numeric: "The :attribute must be :size." - file: "The :attribute must be :size kilobytes." - string: "The :attribute must be :size characters." - array: "The :attribute must contain :size items." - starts_with: "The :attribute must start with one of the following: :values." - string: "The :attribute must be a string." - timezone: "The :attribute must be a valid zone." - unique: "The :attribute has already been taken." - uploaded: "The :attribute failed to upload." - url: "The :attribute format is invalid." - uuid: "The :attribute must be a valid UUID." - - attributes: - username: username - password: password - email: email - title: title - content: content - name_singular: singular name - name_plural: plural name - tag_count_primary: number of primary tags - tag_count_secondary: number of secondary tags From 498864981631efc512861cce4f6a31f1f31c9765 Mon Sep 17 00:00:00 2001 From: Daniel Klabbers Date: Mon, 15 Mar 2021 13:24:21 +0100 Subject: [PATCH 263/272] Release v0.1.0-beta.16 --- extensions/lang-english/CHANGELOG.md | 17 ++++++++++++++++- extensions/lang-english/README.md | 3 ++- extensions/lang-english/composer.json | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/extensions/lang-english/CHANGELOG.md b/extensions/lang-english/CHANGELOG.md index 2723f5f1d..537e3fb2a 100644 --- a/extensions/lang-english/CHANGELOG.md +++ b/extensions/lang-english/CHANGELOG.md @@ -1,6 +1,21 @@ # Changelog -## [0.1.0-beta.14.1](https://github.com/flarum/lang-english/compare/v0.1.0-beta.14.1...v0.1.0-beta.15) +## [0.1.0-beta.16](https://github.com/flarum/lang-english/compare/v0.1.0-beta.15...v0.1.0-beta.16) + +### Added +- Bypass tag requirement label (https://github.com/flarum/lang-english/pull/182) + +### Changed +- Alphabetical order of strings (https://github.com/flarum/lang-english/pull/184) + +### Fixed +- Typo in uninstall confirmation string (https://github.com/flarum/lang-english/pull/181) +- Date format validation string (https://github.com/flarum/lang-english/pull/152) + +### Deleted +- Moved all translation strings to their respective extensions (https://github.com/flarum/lang-english/pull/175) + +## [0.1.0-beta.15](https://github.com/flarum/lang-english/compare/v0.1.0-beta.14.1...v0.1.0-beta.15) ### Added - Keys for new admin interface (#176) diff --git a/extensions/lang-english/README.md b/extensions/lang-english/README.md index 9a716abd4..a6cbb1cb2 100644 --- a/extensions/lang-english/README.md +++ b/extensions/lang-english/README.md @@ -6,4 +6,5 @@ This language pack is bundled with [Flarum](http://flarum.org/). ## Translating Flarum -Because Flarum is at an early development stage, instructions to translate it are currently unavailable. Please check [our documentation](http://flarum.org/docs/translate/) when it will be written. +Because Flarum is at an early development stage, instructions to translate it are currently unavailable. +Please check [our documentation](http://docs.flarum.org) on the topic of translation when it will be written or consult [our community](https://discuss.flarum.org/t/i18n). diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 75c3590cd..13afba996 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -5,7 +5,7 @@ "keywords": ["locale"], "license": "MIT", "require": { - "flarum/core": "^0.1.0-beta.15" + "flarum/core": "^0.1.0-beta.16" }, "extra": { "branch-alias": { From e8f64bc2ac851135ff4ae0c3ca4da9b407416fa3 Mon Sep 17 00:00:00 2001 From: Daniel Klabbers Date: Mon, 15 Mar 2021 13:29:23 +0100 Subject: [PATCH 264/272] fix heading of removed --- extensions/lang-english/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/CHANGELOG.md b/extensions/lang-english/CHANGELOG.md index 537e3fb2a..974ac4f49 100644 --- a/extensions/lang-english/CHANGELOG.md +++ b/extensions/lang-english/CHANGELOG.md @@ -12,7 +12,7 @@ - Typo in uninstall confirmation string (https://github.com/flarum/lang-english/pull/181) - Date format validation string (https://github.com/flarum/lang-english/pull/152) -### Deleted +### Removed - Moved all translation strings to their respective extensions (https://github.com/flarum/lang-english/pull/175) ## [0.1.0-beta.15](https://github.com/flarum/lang-english/compare/v0.1.0-beta.14.1...v0.1.0-beta.15) From 66b98cf4d66740f503df2e2dadbacfe6a2c20fe8 Mon Sep 17 00:00:00 2001 From: David Wheatley Date: Sat, 15 May 2021 00:55:18 +0100 Subject: [PATCH 265/272] Update copyright year --- extensions/lang-english/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/LICENSE b/extensions/lang-english/LICENSE index 86cf0b3ce..54ac29ab2 100644 --- a/extensions/lang-english/LICENSE +++ b/extensions/lang-english/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2019 Stichting Flarum (Flarum Foundation) +Copyright (c) 2019-2021 Stichting Flarum (Flarum Foundation) Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com) Permission is hereby granted, free of charge, to any person obtaining a copy From 2ce16084a23f167541276183831bad70e237760f Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Sun, 16 May 2021 18:28:02 -0400 Subject: [PATCH 266/272] Bump composer reqs for 1.0.0 --- extensions/lang-english/composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 13afba996..6b9c2e2b8 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -5,11 +5,11 @@ "keywords": ["locale"], "license": "MIT", "require": { - "flarum/core": "^0.1.0-beta.16" + "flarum/core": "^1.0.0" }, "extra": { "branch-alias": { - "dev-master": "0.1.x-dev" + "dev-master": "1.x.x-dev" }, "flarum-extension": { "title": "English", From 27f70c5df9a9c8a75cd00134bfd26c82fc5f4a55 Mon Sep 17 00:00:00 2001 From: Daniel Klabbers Date: Tue, 25 May 2021 18:51:56 +0200 Subject: [PATCH 267/272] changes for stable --- extensions/lang-english/CHANGELOG.md | 5 +++++ extensions/lang-english/composer.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/CHANGELOG.md b/extensions/lang-english/CHANGELOG.md index 974ac4f49..555528b89 100644 --- a/extensions/lang-english/CHANGELOG.md +++ b/extensions/lang-english/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [1.0.0](https://github.com/flarum/lang-english/compare/v0.1.0-beta.16...v1.0.0) + +### Changed +- Compatibility with Flarum v1.0.0. + ## [0.1.0-beta.16](https://github.com/flarum/lang-english/compare/v0.1.0-beta.15...v0.1.0-beta.16) ### Added diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 6b9c2e2b8..335f376f7 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -5,7 +5,7 @@ "keywords": ["locale"], "license": "MIT", "require": { - "flarum/core": "^1.0.0" + "flarum/core": "^1.0" }, "extra": { "branch-alias": { From a8c85314a8ee8b033a7a86eaed684ffbf802ad98 Mon Sep 17 00:00:00 2001 From: Daniel Klabbers Date: Tue, 25 May 2021 22:46:03 +0200 Subject: [PATCH 268/272] fix branch alias --- extensions/lang-english/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 335f376f7..ccfa85ece 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -9,7 +9,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.x.x-dev" + "dev-master": "1.x-dev" }, "flarum-extension": { "title": "English", From 9db9cb2ed0f0d95d447fca048e2c880495b5dda8 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Mon, 11 Oct 2021 21:09:59 -0400 Subject: [PATCH 269/272] Release v1.1.0 --- extensions/lang-english/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/lang-english/CHANGELOG.md b/extensions/lang-english/CHANGELOG.md index 555528b89..e7cfe0c34 100644 --- a/extensions/lang-english/CHANGELOG.md +++ b/extensions/lang-english/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [1.1.0](https://github.com/flarum/embed/compare/v1.0.0...v1.1.0) + +No changes. + ## [1.0.0](https://github.com/flarum/lang-english/compare/v0.1.0-beta.16...v1.0.0) ### Changed From 068c513966851bc167005e06f76d4dd2fdeffa5f Mon Sep 17 00:00:00 2001 From: David Wheatley Date: Wed, 13 Oct 2021 08:02:39 +0100 Subject: [PATCH 270/272] chore: bump bundled extension constraint to core 1.1 --- extensions/lang-english/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index ccfa85ece..2a8f88d40 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -5,7 +5,7 @@ "keywords": ["locale"], "license": "MIT", "require": { - "flarum/core": "^1.0" + "flarum/core": "^1.1" }, "extra": { "branch-alias": { From 2e68c53af1e1b7de6dd54b9207c7d0abbcf0eac6 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Thu, 20 Jan 2022 03:33:49 -0500 Subject: [PATCH 271/272] chore: flarum-cli audit infra --fix --- extensions/lang-english/.editorconfig | 23 ++++++-------- extensions/lang-english/.gitattributes | 42 ++++++++++---------------- extensions/lang-english/.gitignore | 13 ++++---- extensions/lang-english/.styleci.yml | 14 +++++++++ extensions/lang-english/composer.json | 21 ++++++++++++- 5 files changed, 66 insertions(+), 47 deletions(-) create mode 100644 extensions/lang-english/.styleci.yml diff --git a/extensions/lang-english/.editorconfig b/extensions/lang-english/.editorconfig index 3dbb3a18b..a61a3ab36 100644 --- a/extensions/lang-english/.editorconfig +++ b/extensions/lang-english/.editorconfig @@ -1,24 +1,19 @@ -# EditorConfig makes it easy to maintain the correct coding style -# when switching between different text editors and projects. -# http://editorconfig.org/ +# EditorConfig helps developers define and maintain consistent +# coding styles between different editors and IDEs +# editorconfig.org -# Top-most EditorConfig file. Do not search in parent directories. root = true -# Set two space indentation, line endings to Unix (LF) with a final newline, -# default charset to UTF-8, and trim trailing whitespace in all files. [*] -indent_style = space -indent_size = 2 end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true +indent_style = space +indent_size = 2 -# Set four space indentation in JSON and PHP files. -[*.{json,php}] -indent_size = 4 - -# Do not trim trailing whitespace in Markdown files. -[*.md] +[*.{diff,md}] trim_trailing_whitespace = false + +[*.{php,xml,json}] +indent_size = 4 diff --git a/extensions/lang-english/.gitattributes b/extensions/lang-english/.gitattributes index 9e31e73e3..ca0f40972 100644 --- a/extensions/lang-english/.gitattributes +++ b/extensions/lang-english/.gitattributes @@ -1,28 +1,18 @@ -# The gitattributes file is a simple text file that gives -# attributes to pathnames. -# http://git-scm.com/docs/gitattributes - -# Automatically normalize line endings for all text-based files. -# http://git-scm.com/docs/gitattributes#_end_of_line_conversion -* text=auto - -# For the following file types, normalize line endings to LF on check -# in and prevent conversion to CRLF when they are checked out (this -# is required in order to prevent newline related issues like, for -# example, after the build script is run). -.* text eol=lf -*.js text eol=lf -*.json text eol=lf -*.md text eol=lf -*.php text eol=lf -*.svg text eol=lf -*.yml text eol=lf - -# Exclude the following files when exporting an archive. -# http://git-scm.com/docs/gitattributes#_creating_an_archive -.editorconfig export-ignore .gitattributes export-ignore -.gitignore export-ignore -README.md export-ignore +.gitignore export-ignore +.gitmodules export-ignore +.github export-ignore +.travis export-ignore +.travis.yml export-ignore +.editorconfig export-ignore +.styleci.yml export-ignore -js/*/dist/*.js -diff +phpunit.xml export-ignore +tests export-ignore + +js/dist/* -diff +js/dist/* linguist-generated +js/dist-typings/* linguist-generated +js/yarn.lock -diff + +* text=auto eol=lf diff --git a/extensions/lang-english/.gitignore b/extensions/lang-english/.gitignore index d773b8db5..4ebb168a0 100644 --- a/extensions/lang-english/.gitignore +++ b/extensions/lang-english/.gitignore @@ -1,11 +1,12 @@ -# The .gitignore file specifies intentionally untracked files that -# Git should ignore. Files already tracked by Git are not affected. -# http://git-scm.com/docs/gitignore - -# Composer /vendor +composer.lock composer.phar -# Operating systems .DS_Store Thumbs.db +tests/.phpunit.result.cache +/tests/integration/tmp +.vagrant +.idea/* +.vscode +js/coverage-ts diff --git a/extensions/lang-english/.styleci.yml b/extensions/lang-english/.styleci.yml new file mode 100644 index 000000000..8806a5402 --- /dev/null +++ b/extensions/lang-english/.styleci.yml @@ -0,0 +1,14 @@ +preset: recommended + +enabled: + - logical_not_operators_with_successor_space + +disabled: + - align_double_arrow + - blank_line_after_opening_tag + - multiline_array_trailing_comma + - new_with_braces + - phpdoc_align + - phpdoc_order + - phpdoc_separation + - phpdoc_types diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 2a8f88d40..1eb429b9a 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -2,7 +2,9 @@ "name": "flarum/lang-english", "type": "flarum-extension", "description": "English language pack.", - "keywords": ["locale"], + "keywords": [ + "locale" + ], "license": "MIT", "require": { "flarum/core": "^1.1" @@ -29,6 +31,23 @@ "flarum-locale": { "code": "en", "title": "English" + }, + "flarum-cli": { + "modules": { + "admin": false, + "forum": false, + "js": false, + "jsCommon": false, + "css": false, + "gitConf": true, + "githubActions": false, + "prettier": false, + "typescript": false, + "bundlewatch": false, + "backendTesting": false, + "editorConfig": true, + "styleci": true + } } } } From 71d72adbdd8a9d7ed8362cad1d631b20da08bb0d Mon Sep 17 00:00:00 2001 From: Daniel Klabbers Date: Thu, 20 Jan 2022 12:52:08 +0100 Subject: [PATCH 272/272] Release v1.2 --- extensions/lang-english/CHANGELOG.md | 4 ++++ extensions/lang-english/composer.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/extensions/lang-english/CHANGELOG.md b/extensions/lang-english/CHANGELOG.md index e7cfe0c34..fc877cf89 100644 --- a/extensions/lang-english/CHANGELOG.md +++ b/extensions/lang-english/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [1.2.0](https://github.com/flarum/embed/compare/v1.1.0...v1.2.0) + +No changes. + ## [1.1.0](https://github.com/flarum/embed/compare/v1.0.0...v1.1.0) No changes. diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json index 1eb429b9a..c9bca48d1 100644 --- a/extensions/lang-english/composer.json +++ b/extensions/lang-english/composer.json @@ -7,7 +7,7 @@ ], "license": "MIT", "require": { - "flarum/core": "^1.1" + "flarum/core": "^1.2" }, "extra": { "branch-alias": {