From c8a1f308c6625e4a9ea10e99141a5d93940a7a0e Mon Sep 17 00:00:00 2001 From: flaburgan Date: Mon, 5 Nov 2018 15:37:09 +0100 Subject: [PATCH] Rename 'toggle mobile' to 'switch to touch-optimized mode' or 'switch to standard mode' closes #7926 --- Changelog.md | 1 + app/assets/templates/header_tpl.jst.hbs | 2 +- app/views/api/openid_connect/error/error.mobile.haml | 2 +- app/views/devise/passwords/edit.mobile.haml | 2 +- app/views/devise/passwords/new.mobile.haml | 2 +- app/views/layouts/_drawer.mobile.haml | 2 +- app/views/registrations/new.mobile.haml | 2 +- app/views/sessions/new.mobile.haml | 2 +- app/views/shared/_links.haml | 2 +- config/locales/diaspora/en.yml | 3 ++- config/locales/javascript/javascript.en.yml | 2 +- 11 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Changelog.md b/Changelog.md index 1ec03fca1..b8eb2b175 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,7 @@ ## Refactor * Improve public stream performance and cleanup unused indexes [#7944](https://github.com/diaspora/diaspora/pull/7944) +* Improve wording of "Toggle mobile" [#7926](https://github.com/diaspora/diaspora/pull/7926) ## Bug fixes * Do not autofollow back a user you are ignoring [#7913](https://github.com/diaspora/diaspora/pull/7913) diff --git a/app/assets/templates/header_tpl.jst.hbs b/app/assets/templates/header_tpl.jst.hbs index 9c3270e5b..d730a8bd5 100644 --- a/app/assets/templates/header_tpl.jst.hbs +++ b/app/assets/templates/header_tpl.jst.hbs @@ -64,7 +64,6 @@ diff --git a/app/views/api/openid_connect/error/error.mobile.haml b/app/views/api/openid_connect/error/error.mobile.haml index dcfd1f5f8..75512477f 100644 --- a/app/views/api/openid_connect/error/error.mobile.haml +++ b/app/views/api/openid_connect/error/error.mobile.haml @@ -5,4 +5,4 @@ = render partial: "api/openid_connect/error/error" %footer - = link_to t("layouts.application.toggle"), toggle_mobile_path + = link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path diff --git a/app/views/devise/passwords/edit.mobile.haml b/app/views/devise/passwords/edit.mobile.haml index 57f168682..a9d7df344 100644 --- a/app/views/devise/passwords/edit.mobile.haml +++ b/app/views/devise/passwords/edit.mobile.haml @@ -26,4 +26,4 @@ = f.submit t("devise.passwords.edit.change_password"), class: "btn btn-primary" %footer - = link_to t("layouts.application.toggle"), toggle_mobile_path + = link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path diff --git a/app/views/devise/passwords/new.mobile.haml b/app/views/devise/passwords/new.mobile.haml index e588d71d0..af496b0bf 100644 --- a/app/views/devise/passwords/new.mobile.haml +++ b/app/views/devise/passwords/new.mobile.haml @@ -26,4 +26,4 @@ = link_to t('devise.sessions.new.sign_in'), new_user_session_path() - = link_to t('layouts.application.toggle'), toggle_mobile_path + = link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path diff --git a/app/views/layouts/_drawer.mobile.haml b/app/views/layouts/_drawer.mobile.haml index 1f248a976..61b6045dc 100644 --- a/app/views/layouts/_drawer.mobile.haml +++ b/app/views/layouts/_drawer.mobile.haml @@ -59,5 +59,5 @@ .pull-right.badge = unreviewed_reports_count = t("admins.admin_bar.report") - %li= link_to t("layouts.application.toggle"), toggle_mobile_path + %li= link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path %li= link_to t("layouts.header.logout"), destroy_user_session_path, method: :delete diff --git a/app/views/registrations/new.mobile.haml b/app/views/registrations/new.mobile.haml index 99c858cd2..7837a875d 100644 --- a/app/views/registrations/new.mobile.haml +++ b/app/views/registrations/new.mobile.haml @@ -15,4 +15,4 @@ %footer.footer %ul %li= link_to t("devise.shared.links.sign_in"), new_session_path(resource_name) - %li= link_to t("layouts.application.toggle"), toggle_mobile_path + %li= link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path diff --git a/app/views/sessions/new.mobile.haml b/app/views/sessions/new.mobile.haml index e15f7af03..a7d7a64aa 100644 --- a/app/views/sessions/new.mobile.haml +++ b/app/views/sessions/new.mobile.haml @@ -21,4 +21,4 @@ id: "forgot_password_link" - if display_registration_link? %li= link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name) - %li= link_to t("layouts.application.toggle"), toggle_mobile_path + %li= link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path diff --git a/app/views/shared/_links.haml b/app/views/shared/_links.haml index 2032d6197..59725ac51 100644 --- a/app/views/shared/_links.haml +++ b/app/views/shared/_links.haml @@ -4,6 +4,6 @@ source_url.to_s, title: t("layouts.application.source_package") %li= link_to t("layouts.application.statistics_link"), statistics_path -%li= link_to t("layouts.application.toggle"), toggle_mobile_path +%li= link_to t("layouts.application.switch_to_touch_optimized_mode"), toggle_mobile_path - if AppConfig.settings.terms.enable? %li= link_to t("_terms"), terms_path diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 7b93ab90f..88ee05b20 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -616,7 +616,8 @@ en: whats_new: "What’s new?" statistics_link: "Pod statistics" discourse: "Project discussions and support" - toggle: "Toggle mobile" + switch_to_touch_optimized_mode: "Switch to touch-optimized mode" + switch_to_standard_mode: "Switch to standard mode" public_feed: "Public diaspora* feed for %{name}" back_to_top: "Back to top" source_package: "Download the source code package" diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml index b935267b5..372d26705 100644 --- a/config/locales/javascript/javascript.en.yml +++ b/config/locales/javascript/javascript.en.yml @@ -311,7 +311,7 @@ en: moderator: "Moderator" log_out: "Log out" toggle_navigation: "Toggle navigation" - toggle_mobile: "Toggle mobile" + switch_to_touch_optimized_mode: "Switch to touch-optimized mode" notifications: "Notifications" conversations: "Conversations"