diff --git a/apps/documenteditor/mobile/app/controller/Search.js b/apps/documenteditor/mobile/app/controller/Search.js index ad2405929..a919a3473 100644 --- a/apps/documenteditor/mobile/app/controller/Search.js +++ b/apps/documenteditor/mobile/app/controller/Search.js @@ -50,7 +50,7 @@ define([ ], function (core, $, _, Backbone) { 'use strict'; - DE.Controllers.Search = Backbone.Controller.extend((function() { + DE.Controllers.Search = Backbone.Controller.extend(_.extend((function() { // private var _isShow = false, @@ -305,7 +305,7 @@ define([ // API handlers - textNoTextFound : 'Text not found', + textNoTextFound : 'Text not found' } - })()); + })(), DE.Controllers.Search || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js index f72ddc560..62c3a69d4 100644 --- a/apps/documenteditor/mobile/app/controller/Settings.js +++ b/apps/documenteditor/mobile/app/controller/Settings.js @@ -47,7 +47,7 @@ define([ ], function (core) { 'use strict'; - DE.Controllers.Settings = Backbone.Controller.extend((function() { + DE.Controllers.Settings = Backbone.Controller.extend(_.extend((function() { // private var rootView, inProgress, @@ -92,12 +92,6 @@ define([ }, initEvents: function () { - - - // $('#font-bold').single('click', _.bind(me.onBold, me)); - // $('#font-italic').single('click', _.bind(me.onItalic, me)); - // $('#font-underline').single('click', _.bind(me.onUnderline, me)); - // $('#font-strikethrough').single('click', _.bind(me.onStrikethrough, me)); }, rootView : function() { @@ -272,5 +266,5 @@ define([ notcriticalErrorTitle : 'Warning', warnDownloadAs : 'If you continue saving in this format all features except the text will be lost.
Are you sure you want to continue?' } - })()); -}); + })(), DE.Controllers.Settings || {})) +}); \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/template/Search.template b/apps/documenteditor/mobile/app/template/Search.template index 29edb466c..7454314f4 100644 --- a/apps/documenteditor/mobile/app/template/Search.template +++ b/apps/documenteditor/mobile/app/template/Search.template @@ -24,11 +24,11 @@

- Replace + <%= scope.textReplace %>

<% } else { %>

- Replace + <%= scope.textReplace %>

@@ -42,8 +42,8 @@
-
<% if (isEdit) { %>Find and Replace<% } else { %>Find<% } %>
-
<% if (phone) { %>Done<% } %>
+
<%= isEdit ? scope.textFindAndReplace : scope.textFind %>
+
<% if (phone) { %><%= scope.textDone %><% } %>
@@ -56,7 +56,7 @@ <% if (android) { %>
<% } %>
-
Find
+
<%= scope.textFind %>
@@ -65,7 +65,7 @@ <% if (android) { %>
<% } %>
-
Find and Replace
+
<%= scope.textFindAndReplace %>
@@ -77,7 +77,7 @@
  • -
    Case sensitive
    +
    <%= scope.textCase %>
  • -
    Highlight results
    +
    <%= scope.textHighlight %>
    -
    Edit Document
    +
    <%= scope.textEditDoc %>
    @@ -41,7 +41,7 @@
    -
    Reader Mode
    +
    <%= scope.textReader %>
    -
    Download
    +
    <%= scope.textDownload %>
    @@ -70,7 +70,7 @@
    • -
    Document Info
    +
    <%= scope.textDocInfo %>
    @@ -94,7 +94,7 @@
    -
    Help
    +
    <%= scope.textHelp %>
    @@ -106,7 +106,7 @@
    -
    About
    +
    <%= scope.textAbout %>
    @@ -124,78 +124,75 @@
    - - <% if (!android) { %> - Back - <% } %> + <% if (!android) { %><%= scope.textBack %><% } %>
    -
    Document Info
    +
    <%= scope.textDocInfo %>
    -
    Document title
    +
    <%= scope.textDocTitle %>
    • -
      Loading...
      +
      <%= scope.textLoading %>
    -
    Author
    +
    <%= scope.textAuthor %>
    • -
      Loading...
      +
      <%= scope.textLoading %>
    -
    Create date
    +
    <%= scope.textCreateDate %>
    • -
      Loading...
      +
      <%= scope.textLoading %>
    -
    Statistic
    +
    <%= scope.textStatistic %>
    -
    Download As...
    +
    <%= scope.textDownloadAs %>
    diff --git a/apps/documenteditor/mobile/app/view/DocumentHolder.js b/apps/documenteditor/mobile/app/view/DocumentHolder.js index 0d8a07168..6541010c2 100644 --- a/apps/documenteditor/mobile/app/view/DocumentHolder.js +++ b/apps/documenteditor/mobile/app/view/DocumentHolder.js @@ -67,14 +67,7 @@ define([ // Render layout render: function() { var el = $(this.el); - - el.append(this.template({ - // - })); - - // this.f7View = uiApp.addView('.view-main', { - // // params - // }); + el.append(this.template({})); return this; }, diff --git a/apps/documenteditor/mobile/app/view/Search.js b/apps/documenteditor/mobile/app/view/Search.js index f55735638..d9b4dc64a 100644 --- a/apps/documenteditor/mobile/app/view/Search.js +++ b/apps/documenteditor/mobile/app/view/Search.js @@ -48,7 +48,7 @@ define([ ], function (searchTemplate, $, _, Backbone) { 'use strict'; - DE.Views.Search = Backbone.View.extend((function() { + DE.Views.Search = Backbone.View.extend(_.extend((function() { // private var _isEdit = false, _layout; @@ -76,7 +76,8 @@ define([ _layout = $('
    ').append(this.template({ android : Common.SharedSettings.get('android'), phone : Common.SharedSettings.get('phone'), - isEdit : _isEdit + isEdit : _isEdit, + scope : this })); return this; @@ -183,7 +184,14 @@ define([ uiApp.hideNavbar(searchBar); }, 10); } - } + }, + + textFind: 'Find', + textFindAndReplace: 'Find and Replace', + textDone: 'Done', + textReplace: 'Replace', + textCase: 'Case sensitive', + textHighlight: 'Highlight results' } - })()); + })(), DE.Views.Search || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/view/Settings.js b/apps/documenteditor/mobile/app/view/Settings.js index 20771c1cb..40fd8e83b 100644 --- a/apps/documenteditor/mobile/app/view/Settings.js +++ b/apps/documenteditor/mobile/app/view/Settings.js @@ -48,7 +48,7 @@ define([ ], function (settingsTemplate, $, _, Backbone) { 'use strict'; - DE.Views.Settings = Backbone.View.extend((function() { + DE.Views.Settings = Backbone.View.extend(_.extend((function() { // private var isEdit; @@ -83,7 +83,8 @@ define([ render: function() { this.layout = $('
    ').append(this.template({ android : Common.SharedSettings.get('android'), - phone : Common.SharedSettings.get('phone') + phone : Common.SharedSettings.get('phone'), + scope : this })); return this; @@ -95,14 +96,13 @@ define([ rootLayout: function () { if (this.layout) { - var $layour = this.layout - .find('#settings-root-view'); - var isPhone = Common.SharedSettings.get('phone'); + var $layour = this.layout.find('#settings-root-view'), + isPhone = Common.SharedSettings.get('phone'); if (isEdit) { $layour.find('#settings-edit-document').hide(); $layour.find('#settings-readermode').hide(); - $layour.find('#settings-search .item-title').text('Find and Replace') + $layour.find('#settings-search .item-title').text(this.textFindAndReplace) } else { $layour.find('#settings-readermode input:checkbox') .attr('checked', Common.SharedSettings.get('readerMode')) @@ -183,7 +183,34 @@ define([ } }, - unknownText: 'Unknown' - } - })()); -}); + unknownText: 'Unknown', + textFindAndReplace: 'Find and Replace', + textSettings: 'Settings', + textDone: 'Done', + textFind: 'Find', + textEditDoc: 'Edit Document', + textReader: 'Reader Mode', + textDownload: 'Download', + textDocInfo: 'Document Info', + textHelp: 'Help', + textAbout: 'About', + textBack: 'Back', + textDocTitle: 'Document title', + textLoading: 'Loading...', + textAuthor: 'Author', + textCreateDate: 'Create date', + textStatistic: 'Statistic', + textPages: 'Pages', + textParagraphs: 'Paragraphs', + textWords: 'Words', + textSymbols: 'Symbols', + textSpaces: 'Spaces', + textDownloadAs: 'Download As...', + textVersion: 'Version', + textAddress: 'address', + textEmail: 'email', + textTel: 'tel' + + } + })(), DE.Views.Settings || {})) +}); \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index bd0692388..54b465f14 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -83,11 +83,51 @@ "DE.Controllers.Main.advDRMOptions": "Protected File", "DE.Controllers.Main.advDRMEnterPassword": "You password please:", "DE.Controllers.Main.advDRMPassword": "Password", + "DE.Controllers.DocumentHolder.menuCut": "Cut", "DE.Controllers.DocumentHolder.menuCopy": "Copy", "DE.Controllers.DocumentHolder.menuPaste": "Paste", "DE.Controllers.DocumentHolder.menuEdit": "Edit", "DE.Controllers.DocumentHolder.menuDelete": "Delete", "DE.Controllers.DocumentHolder.menuAddLink": "Add Link", - "DE.Controllers.DocumentHolder.menuOpenLink": "Open Link" + "DE.Controllers.DocumentHolder.menuOpenLink": "Open Link", + + "DE.Controllers.Search.textNoTextFound": "Text not Found", + "DE.Views.Search.textFind": "Find", + "DE.Views.Search.textFindAndReplace": "Find and Replace", + "DE.Views.Search.textDone": "Done", + "DE.Views.Search.textReplace": "Replace", + "DE.Views.Search.textCase": "Case sensitive", + "DE.Views.Search.textHighlight": "Highlight results", + + "DE.Controllers.Settings.txtLoading": "Loading...", + "DE.Controllers.Settings.notcriticalErrorTitle": "Warning", + "DE.Controllers.Settings.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", + "DE.Views.Settings.unknownText": "Unknown", + "DE.Views.Settings.textFindAndReplace": "Find and Replace", + "DE.Views.Settings.textSettings": "Settings", + "DE.Views.Settings.textDone": "Done", + "DE.Views.Settings.textFind": "Find", + "DE.Views.Settings.textEditDoc": "Edit Document", + "DE.Views.Settings.textReader": "Reader Mode", + "DE.Views.Settings.textDownload": "Download", + "DE.Views.Settings.textDocInfo": "Document Info", + "DE.Views.Settings.textHelp": "Help", + "DE.Views.Settings.textAbout": "About", + "DE.Views.Settings.textBack": "Back", + "DE.Views.Settings.textDocTitle": "Document title", + "DE.Views.Settings.textLoading": "Loading...", + "DE.Views.Settings.textAuthor": "Author", + "DE.Views.Settings.textCreateDate": "Create date", + "DE.Views.Settings.textStatistic": "Statistic", + "DE.Views.Settings.textPages": "Pages", + "DE.Views.Settings.textParagraphs": "Paragraphs", + "DE.Views.Settings.textWords": "Words", + "DE.Views.Settings.textSymbols": "Symbols", + "DE.Views.Settings.textSpaces": "Spaces", + "DE.Views.Settings.textDownloadAs": "Download As...", + "DE.Views.Settings.textVersion": "Version", + "DE.Views.Settings.textAddress": "address", + "DE.Views.Settings.textEmail": "email", + "DE.Views.Settings.textTel": "tel" } \ No newline at end of file