From 71ecb164c87aeecc7e56dbc3a98f4258414d8478 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Wed, 14 Feb 2018 08:14:54 +0100 Subject: [PATCH] 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