Unverified Commit c8a1f308 authored by flaburgan's avatar flaburgan Committed by Benjamin Neff

Rename 'toggle mobile' to 'switch to touch-optimized mode' or 'switch to standard mode'

closes #7926
parent 6804132c
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
## Refactor ## Refactor
* Improve public stream performance and cleanup unused indexes [#7944](https://github.com/diaspora/diaspora/pull/7944) * 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 ## Bug fixes
* Do not autofollow back a user you are ignoring [#7913](https://github.com/diaspora/diaspora/pull/7913) * Do not autofollow back a user you are ignoring [#7913](https://github.com/diaspora/diaspora/pull/7913)
......
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
<ul class="nav navbar-nav navbar-left visible-sm-block visible-xs-block"> <ul class="nav navbar-nav navbar-left visible-sm-block visible-xs-block">
<li class="visible-xs-block"><a href="/stream">{{t "my_stream"}}</a></li> <li class="visible-xs-block"><a href="/stream">{{t "my_stream"}}</a></li>
<li class="visible-xs-block"><a href="/activity">{{t "my_activity"}}</a></li> <li class="visible-xs-block"><a href="/activity">{{t "my_activity"}}</a></li>
<li><a href="/mobile/toggle">{{t "header.toggle_mobile"}}</a></li>
</ul> </ul>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
...@@ -87,6 +86,7 @@ ...@@ -87,6 +86,7 @@
{{else if current_user.moderator}} {{else if current_user.moderator}}
<li><a href="/report">{{t "header.moderator"}}</a></li> <li><a href="/report">{{t "header.moderator"}}</a></li>
{{/if}} {{/if}}
<li><a class="visible-xs-block" href="/mobile/toggle">{{t "header.switch_to_touch_optimized_mode"}}</a></li>
<li><a href="/users/sign_out" data-method="delete">{{t "header.log_out"}}</a></li> <li><a href="/users/sign_out" data-method="delete">{{t "header.log_out"}}</a></li>
</ul> </ul>
</li> </li>
......
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
= render partial: "api/openid_connect/error/error" = render partial: "api/openid_connect/error/error"
%footer %footer
= link_to t("layouts.application.toggle"), toggle_mobile_path = link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path
...@@ -26,4 +26,4 @@ ...@@ -26,4 +26,4 @@
= f.submit t("devise.passwords.edit.change_password"), class: "btn btn-primary" = f.submit t("devise.passwords.edit.change_password"), class: "btn btn-primary"
%footer %footer
= link_to t("layouts.application.toggle"), toggle_mobile_path = link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path
...@@ -26,4 +26,4 @@ ...@@ -26,4 +26,4 @@
= link_to t('devise.sessions.new.sign_in'), new_user_session_path() = 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
...@@ -59,5 +59,5 @@ ...@@ -59,5 +59,5 @@
.pull-right.badge .pull-right.badge
= unreviewed_reports_count = unreviewed_reports_count
= t("admins.admin_bar.report") = 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 %li= link_to t("layouts.header.logout"), destroy_user_session_path, method: :delete
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
%footer.footer %footer.footer
%ul %ul
%li= link_to t("devise.shared.links.sign_in"), new_session_path(resource_name) %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
...@@ -21,4 +21,4 @@ ...@@ -21,4 +21,4 @@
id: "forgot_password_link" id: "forgot_password_link"
- if display_registration_link? - if display_registration_link?
%li= link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name) %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
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
source_url.to_s, source_url.to_s,
title: t("layouts.application.source_package") title: t("layouts.application.source_package")
%li= link_to t("layouts.application.statistics_link"), statistics_path %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? - if AppConfig.settings.terms.enable?
%li= link_to t("_terms"), terms_path %li= link_to t("_terms"), terms_path
...@@ -616,7 +616,8 @@ en: ...@@ -616,7 +616,8 @@ en:
whats_new: "What’s new?" whats_new: "What’s new?"
statistics_link: "Pod statistics" statistics_link: "Pod statistics"
discourse: "Project discussions and support" 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}" public_feed: "Public diaspora* feed for %{name}"
back_to_top: "Back to top" back_to_top: "Back to top"
source_package: "Download the source code package" source_package: "Download the source code package"
......
...@@ -311,7 +311,7 @@ en: ...@@ -311,7 +311,7 @@ en:
moderator: "Moderator" moderator: "Moderator"
log_out: "Log out" log_out: "Log out"
toggle_navigation: "Toggle navigation" toggle_navigation: "Toggle navigation"
toggle_mobile: "Toggle mobile" switch_to_touch_optimized_mode: "Switch to touch-optimized mode"
notifications: "Notifications" notifications: "Notifications"
conversations: "Conversations" conversations: "Conversations"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment