From e12dc66d2adafdb023318d9997f4871dc30fd3a4 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Fri, 19 Sep 2014 12:28:45 +0400
Subject: [PATCH] Final i18n fixes

Enable mdown for some "\n" l10n keys
Disabled language select since there is only English available
---
 app/js/directives.js             |  4 ++--
 app/js/locales/en-us.json        | 10 +++++-----
 app/partials/confirm_modal.html  |  2 +-
 app/partials/login.html          |  2 +-
 app/partials/settings_modal.html |  4 ++--
 app/partials/welcome.html        |  2 +-
 app/webogram.appcache            |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/js/directives.js b/app/js/directives.js
index 63f96c2b..d3b6967e 100644
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -1263,7 +1263,7 @@ angular.module('myApp.directives', ['myApp.filters'])
           $scope.progress.enabled = false;
 
           if (e && e.type == 'FS_BROWSER_UNSUPPORTED') {
-            $scope.error = {html: _('browser_no_local_file_system_image', {
+            $scope.error = {html: _('error_browser_no_local_file_system_image_md', {
               'moz-link': '<a href="{0}" target="_blank">{1}</a>',
               'chrome-link': '<a href="{0}" target="_blank">{1}</a>',
               'telegram-link': '<a href="{0}" target="_blank">{1}</a>'
@@ -1327,7 +1327,7 @@ angular.module('myApp.directives', ['myApp.filters'])
         $scope.player.src = '';
 
         if (e && e.type == 'FS_BROWSER_UNSUPPORTED') {
-          $scope.error = {html: _('error_browser_no_local_file_system_video', {
+          $scope.error = {html: _('error_browser_no_local_file_system_video_md', {
               'moz-link': '<a href="{0}" target="_blank">{1}</a>',
               'chrome-link': '<a href="{0}" target="_blank">{1}</a>',
               'telegram-link': '<a href="{0}" target="_blank">{1}</a>'
diff --git a/app/js/locales/en-us.json b/app/js/locales/en-us.json
index 975e62b0..abd34423 100644
--- a/app/js/locales/en-us.json
+++ b/app/js/locales/en-us.json
@@ -69,9 +69,9 @@
 	"media_modal_download": "Download",
 	"media_modal_delete": "Delete",
 
-	"error_browser_no_local_file_system_image": "Your browser doesn't support {moz-link: https://developer.mozilla.org/en-US/docs/Web/API/LocalFileSystem | LocalFileSystem} feature which is needed to display this image.\nPlease, install {chrome-link: http://google.com/chrome | Google Chrome} or use {telegram-link: https://telegram.org/ | mobile app} instead.",
+	"error_browser_no_local_file_system_image_md": "Your browser doesn't support {moz-link: https://developer.mozilla.org/en-US/docs/Web/API/LocalFileSystem | LocalFileSystem} feature which is needed to display this image.\nPlease, install {chrome-link: http://google.com/chrome | Google Chrome} or use {telegram-link: https://telegram.org/ | mobile app} instead.",
 	"error_image_download_failed": "Download failed",
-	"error_browser_no_local_file_system_video": "Your browser doesn't support {moz-link: https://developer.mozilla.org/en-US/docs/Web/API/LocalFileSystem | LocalFileSystem} feature which is needed to play this video.\nPlease, install {chrome-link: http://google.com/chrome | Google Chrome} or use {telegram-link: https://telegram.org/ | mobile app} instead.",
+	"error_browser_no_local_file_system_video_md": "Your browser doesn't support {moz-link: https://developer.mozilla.org/en-US/docs/Web/API/LocalFileSystem | LocalFileSystem} feature which is needed to play this video.\nPlease, install {chrome-link: http://google.com/chrome | Google Chrome} or use {telegram-link: https://telegram.org/ | mobile app} instead.",
 	"error_video_download_failed": "Video download failed",
 
 	"user_name_deleted": "DELETED",
@@ -107,7 +107,7 @@
 	"confirm_modal_update_reload": "A new version of Webogram has been downloaded. Launch it?",
 	"confirm_modal_history_flush": "Are you sure? This can not be undone!",
 	"confirm_modal_terminate_sessions": "Are you sure you want to log out all devices except for the current one?",
-	"confirm_modal_mixed_content_fail_http_redirect": "Your browser {moz-link: does not support} mixed content which is neccessary for MTProto support on https. {issue-link: Learn more}\n\n Would you like to use http-version instead?",
+	"confirm_modal_mixed_content_fail_http_redirect_md": "Your browser {moz-link: does not support} mixed content which is neccessary for MTProto support on https. {issue-link: Learn more}\n\n Would you like to use http-version instead?",
 	"confirm_modal_clipboard_file_send": "Are you sure to send file(s) from clipboard?",
 	"confirm_modal_clipboard_X_files_send": "{'one': 'Are you sure to send file from clipboard?', 'other': 'Are you sure to send {} files from clipboard?'}",
 	"confirm_modal_message_delete": "Are you sure you want to delete the message?",
@@ -284,7 +284,7 @@
 	"login_edit_number": "Edit phone number",
 	"login_enter_code_label_md": "Please enter the code you've just received in your other **Telegram** app",
 	"login_code_not_received": "Haven't received the code?",
-	"login_enter_sms_code_label": "We have sent you a code via SMS.\nPlease enter it below.",
+	"login_enter_sms_code_label_md": "We have sent you a code via SMS.\nPlease enter it below.",
 	"login_call_remaining": "Telegram will call you in {remaining}",
 	"login_calling": "Telegram is calling you",
 	"login_number_dialed": "Telegram dialed your number",
@@ -333,7 +333,7 @@
 	"welcome_easy_sharing_header": "Easy file sharing",
 	"welcome_easy_sharing_text": "Share files of any type using drag-and-drop or the attachment icon",
 	"welcome_powerful_tools_header": "Powerful tools",
-	"welcome_powerful_tools_text": "Browse shared media and files by type \n and set custom notifications",
+	"welcome_powerful_tools_text_md": "Browse shared media and files by type \n and set custom notifications",
 
 	"country_select_modal_country_ab": "Abkhazia",
 	"country_select_modal_country_af": "Afghanistan",
diff --git a/app/partials/confirm_modal.html b/app/partials/confirm_modal.html
index 78f04498..3c548f29 100644
--- a/app/partials/confirm_modal.html
+++ b/app/partials/confirm_modal.html
@@ -9,7 +9,7 @@
       <span ng-switch-when="WEBOGRAM_UPDATED_RELOAD" my-i18n="confirm_modal_update_reload"></span>
       <span ng-switch-when="HISTORY_FLUSH" my-i18n="confirm_modal_history_flush"></span>
       <span ng-switch-when="TERMINATE_SESSIONS" my-i18n="confirm_modal_terminate_sessions"></span>
-      <span ng-switch-when="HTTPS_MIXED_FAIL" my-i18n="confirm_modal_mixed_content_fail_http_redirect">
+      <span ng-switch-when="HTTPS_MIXED_FAIL" my-i18n="confirm_modal_mixed_content_fail_http_redirect_md">
         <my-i18n-param name="moz-link"><a href="http://mzl.la/13jCUSU" target="_blank">{0}</a></my-i18n-param>
         <my-i18n-param name="issue-link"><a href="https://github.com/zhukov/webogram/issues/237" target="_blank">{0} &raquo;</a></my-i18n-param>
       </span>
diff --git a/app/partials/login.html b/app/partials/login.html
index e917997c..36b573ae 100644
--- a/app/partials/login.html
+++ b/app/partials/login.html
@@ -38,7 +38,7 @@
         </p>
       </div>
       <div ng-switch-default>
-        <p class="login_form_lead" my-i18n="login_enter_sms_code_label"></p>
+        <p class="login_form_lead" my-i18n="login_enter_sms_code_label_md"></p>
 
         <p class="login_form_lead">
           <span ng-show="callPending.remaining > 0" my-i18n="login_call_remaining">
diff --git a/app/partials/settings_modal.html b/app/partials/settings_modal.html
index ae55bdfd..a60cbc03 100644
--- a/app/partials/settings_modal.html
+++ b/app/partials/settings_modal.html
@@ -64,10 +64,10 @@
       <div class="modal_section_body">
 
         <div class="tg_form_group">
-          <label my-i18n="settings_modal_language"></label>
+          <!--label my-i18n="settings_modal_language"></label>
           <select class="tg_select" ng-model="i18n.locale">
             <option value="{{lang}}" ng-selected="lang == i18n.locale" ng-repeat="(lang, name) in i18n.supported" ng-bind="name"></option>
-          </select>
+          </select-->
 
           <a class="tg_checkbox" ng-click="toggleDesktop()" ng-class="notify.desktop ? 'tg_checkbox_on' : ''">
             <span class="icon icon-checkbox-outer"><i class="icon-checkbox-inner"></i></span>
diff --git a/app/partials/welcome.html b/app/partials/welcome.html
index 3d6b44e1..3b4cd6f9 100644
--- a/app/partials/welcome.html
+++ b/app/partials/welcome.html
@@ -41,7 +41,7 @@
             <div class="welcome_footer_card_wrap">
               <div class="welcome_footer_card welcome_footer_card_powerful"></div>
               <h4 my-i18n="welcome_powerful_tools_header"></h4>
-              <div class="welcome_footer_card_lead" my-i18n="welcome_powerful_tools_text"></div>
+              <div class="welcome_footer_card_lead" my-i18n="welcome_powerful_tools_text_md"></div>
             </div>
           </div>
 
diff --git a/app/webogram.appcache b/app/webogram.appcache
index ae834a9c..7ff0f8c9 100644
--- a/app/webogram.appcache
+++ b/app/webogram.appcache
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
-# 29
+# 30
 
 NETWORK:
 *