Canh Ngo pushed to branch release/4.0 at cms-community / 
hippo-addon-channel-manager


Commits:
34fe51d6 by Mathijs den Burger at 2016-08-03T14:43:22+02:00
CHANNELMGR-828 Translate 'OK' in alert and 'Select' in menu 
editor

Moved the ALERT_OK to OK so we can reuse the 'OK' translation in
multiple locations. The 'Select' seems pretty specific for this
sub-page (e.g. we also have another more specific 'Select link type'
label with the key PICKER_SELECT), so changed the untranslated
label 'SELECT' to 'SUBPAGE_MENU_EDITOR_SELECT_INTERNAL_LINK'.

(cherry picked from commit 3309ced01f189a4706fe125e4c3d61e4a17beeac)

- - - - -


3 changed files:

- frontend-ng/src/angularjs/channel/menu/editor.html
- frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
- frontend-ng/src/i18n/en.json


Changes:

=====================================
frontend-ng/src/angularjs/channel/menu/editor.html
=====================================
--- a/frontend-ng/src/angularjs/channel/menu/editor.html
+++ b/frontend-ng/src/angularjs/channel/menu/editor.html
@@ -106,7 +106,7 @@
                 <md-button type="button"
                            ng-disabled="menuEditor.isLockedByOther()"
                            ng-click="menuEditor.showPicker($event)">
-                  {{ 'SELECT' | translate }}
+                  {{ 'SUBPAGE_MENU_EDITOR_SELECT_INTERNAL_LINK' | translate }}
                 </md-button>
               </div>
             </div>


=====================================
frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
=====================================
--- a/frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
+++ b/frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
@@ -96,7 +96,7 @@ export class PageEditCtrl {
         this.$mdDialog.alert()
           .clickOutsideToClose(true)
           .textContent(textContent)
-          .ok(this.$translate.instant('ALERT_OK'))
+          .ok(this.$translate.instant('OK'))
       );
     }
   }


=====================================
frontend-ng/src/i18n/en.json
=====================================
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -1,6 +1,5 @@
 {
   "ADVANCED_SETTINGS": "Advanced settings",
-  "ALERT_OK": "OK",
   "CANCEL": "Cancel",
   "CHANNEL_PROPERTIES_SAVE_SUCCESS": "Channel settings saved successfully",
   "COLLAPSE": "Collapse",
@@ -69,6 +68,7 @@
   "LINK_REQUIRED": "Link is required",
   "MOVE": "Move",
   "NEW_MENU_ITEM_TITLE": "Untitled",
+  "OK": "OK",
   "PICKER_EMPTY_TREE": "No documents are available",
   "PICKER_LISTING_NAME": "Name",
   "PICKER_SELECT": "Select link type",
@@ -91,6 +91,7 @@
   "SUBPAGE_MENU_EDITOR_EXTERNAL_LINK": "External link",
   "SUBPAGE_MENU_EDITOR_INTERNAL_LINK": "Internal link",
   "SUBPAGE_MENU_EDITOR_NO_LINK": "No link",
+  "SUBPAGE_MENU_EDITOR_SELECT_INTERNAL_LINK": "Select",
   "SUBPAGE_PAGE_COPY_LABEL_CHANNEL": "Destination channel",
   "SUBPAGE_PAGE_COPY_LABEL_URL_STEM": "Destination URL",
   "SUBPAGE_PAGE_COPY_TITLE": "Copy page '{{pageName}}'",



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/34fe51d6cb68309217bf477f17a32279b6680427
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

Reply via email to