From 95fdece370d401771d421d666729d16175432987 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 17 Jul 2015 17:47:53 +0930 Subject: [PATCH] Remove duplicates; replace missing commas --- framework/core/locale/en/translations.yml | 2 - .../core/src/Forum/Actions/ClientAction.php | 166 +++++++++--------- 2 files changed, 82 insertions(+), 86 deletions(-) diff --git a/framework/core/locale/en/translations.yml b/framework/core/locale/en/translations.yml index 8277c1361..76e8eaf57 100644 --- a/framework/core/locale/en/translations.yml +++ b/framework/core/locale/en/translations.yml @@ -20,7 +20,6 @@ core: confirmation_email_sent: "We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder." controls: Controls delete: Delete - delete: Delete delete_account: Delete Account delete_account_help: "Hold up! If you delete your account, there's no going back. Keep in mind:" delete_forever: Delete Forever @@ -93,7 +92,6 @@ core: search_forum: Search Forum send_password_reset_email: Send Password Reset Email settings: Settings - settings: Settings sign_up: Sign Up sort_newest: Newest sort_oldest: Oldest diff --git a/framework/core/src/Forum/Actions/ClientAction.php b/framework/core/src/Forum/Actions/ClientAction.php index 46659c77e..57e511a89 100644 --- a/framework/core/src/Forum/Actions/ClientAction.php +++ b/framework/core/src/Forum/Actions/ClientAction.php @@ -18,117 +18,115 @@ abstract class ClientAction extends BaseClientAction * {@inheritdoc} */ protected $translationKeys = [ - 'core.account' - 'core.activity' - 'core.administration' - 'core.alert' - 'core.all_discussions' - 'core.before_log_in_link' - 'core.before_sign_up_link' - 'core.bio_placeholder' - 'core.cannot_reply' - 'core.cannot_reply_help' + 'core.account', + 'core.activity', + 'core.administration', + 'core.alert', + 'core.all_discussions', + 'core.before_log_in_link', + 'core.before_sign_up_link', + 'core.bio_placeholder', + 'core.cannot_reply', + 'core.cannot_reply_help', 'core.change_email', 'core.change_password', 'core.change_password_help', 'core.close', - 'core.confirm_delete_discussion' + 'core.confirm_delete_discussion', 'core.confirm_discard_discussion', - 'core.confirm_discard_edit' - 'core.confirm_discard_reply' + 'core.confirm_discard_edit', + 'core.confirm_discard_reply', 'core.confirmation_email_sent', 'core.controls', - 'core.delete' - 'core.delete' + 'core.delete', 'core.delete_account', 'core.delete_account_help', - 'core.delete_forever' + 'core.delete_forever', 'core.deleted', - 'core.disclose_online' - 'core.discussion_renamed' + 'core.disclose_online', + 'core.discussion_renamed', 'core.discussion_renamed_notification', 'core.discussion_replied', 'core.discussion_started', 'core.discussion_title', - 'core.discussions' - 'core.dismiss' - 'core.edit' - 'core.editing_post' - 'core.email' - 'core.email_confirmation_required' + 'core.discussions', + 'core.dismiss', + 'core.edit', + 'core.editing_post', + 'core.email', + 'core.email_confirmation_required', 'core.exit_full_screen', - 'core.forgot_password' - 'core.forgot_password_help' - 'core.forgot_password_link' + 'core.forgot_password', + 'core.forgot_password_help', + 'core.forgot_password_link', 'core.full_screen', 'core.go_to', - 'core.group_admin' - 'core.group_admins' - 'core.group_guest' - 'core.group_guests' - 'core.group_member' - 'core.group_members' - 'core.group_mod' - 'core.group_mods' - 'core.invalid_login' - 'core.joined' - 'core.joined_the_forum' + 'core.group_admin', + 'core.group_admins', + 'core.group_guest', + 'core.group_guests', + 'core.group_member', + 'core.group_members', + 'core.group_mod', + 'core.group_mods', + 'core.invalid_login', + 'core.joined', + 'core.joined_the_forum', 'core.load_more', - 'core.log_in' - 'core.log_in_to_reply' - 'core.log_out' - 'core.mark_all_as_read' + 'core.log_in', + 'core.log_in_to_reply', + 'core.log_out', + 'core.mark_all_as_read', 'core.mark_as_read', 'core.minimize', - 'core.no_notifications' - 'core.notifications' - 'core.notify_discussion_renamed' - 'core.now' - 'core.online' - 'core.original_post' - 'core.password' - 'core.password_reset_email_sent' - 'core.period_later' + 'core.no_notifications', + 'core.notifications', + 'core.notify_discussion_renamed', + 'core.now', + 'core.online', + 'core.original_post', + 'core.password', + 'core.password_reset_email_sent', + 'core.period_later', 'core.post_discussion', - 'core.post_edited' - 'core.post_number' - 'core.post_reply' - 'core.posted_a_reply' - 'core.posts' + 'core.post_edited', + 'core.post_number', + 'core.post_reply', + 'core.posted_a_reply', + 'core.posts', 'core.posts_will_remain', - 'core.powered_by_flarum' - 'core.privacy' - 'core.profile' - 'core.prompt_rename_discussion' - 'core.recover_password' - 'core.refresh' + 'core.powered_by_flarum', + 'core.privacy', + 'core.profile', + 'core.prompt_rename_discussion', + 'core.recover_password', + 'core.refresh', 'core.remove', - 'core.rename' - 'core.reply' - 'core.reply_posted' - 'core.restore' + 'core.rename', + 'core.reply', + 'core.reply_posted', + 'core.restore', 'core.save_changes', - 'core.search_all_discussions' - 'core.search_forum' + 'core.search_all_discussions', + 'core.search_forum', 'core.send_password_reset_email', - 'core.settings' - 'core.settings' - 'core.sign_up' - 'core.sort_newest' - 'core.sort_oldest' - 'core.sort_recent' - 'core.sort_replies' - 'core.start_a_discussion' - 'core.started_a_discussion' - 'core.unread_posts' + 'core.settings', + 'core.sign_up', + 'core.sort_newest', + 'core.sort_oldest', + 'core.sort_recent', + 'core.sort_replies', + 'core.start_a_discussion', + 'core.started_a_discussion', + 'core.unread_posts', 'core.upload', - 'core.username' - 'core.username_or_email' + 'core.username', + 'core.username_or_email', 'core.username_will_be_released', - 'core.users' - 'core.view' - 'core.viewing_posts' - 'core.welcome_user' + 'core.users', + 'core.view', + 'core.viewing_posts', + 'core.welcome_user', 'core.write_a_post', 'core.write_a_reply' ];