Yangman - LIST_PREV_ITEM not translated

- Bug 6428 - YangMan - tooltip next to yang menu not translated
- + change condition when is LIST_PREV_ITEM button is shown
- + also added LIST_NEXT_ITEM translation

Change-Id: Ibbc5afc26bb19f982c15e7047aac98c582814fcc
Signed-off-by: michal.kovacik <mikovaci@cisco.com>

diff --git a/modules/yangman-resources/src/main/resources/yangman/assets/data/locale-en_US.json b/modules/yangman-resources/src/main/resources/yangman/assets/data/locale-en_US.json
index 4b675d80fca4f28c508c1615afe3a2724024d47e..e0e816074ea63496ddc1c7c282eb130ce1897d6b 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/assets/data/locale-en_US.json
+++ b/modules/yangman-resources/src/main/resources/yangman/assets/data/locale-en_US.json
@@ -93,5 +93,8 @@
   "YANGMAN_SORT_COLLECTIONS_DESC": "Sort collections descending",
   "YANGMAN_SORT_COLLECTIONS_ASC": "Sort collections ascending",
   "YANGMAN_LIST_DELETE_ITEM": "Delete list item",
-  "YANGMAN_LIST_INDEX_DUPLICATE": "Duplicated index"
+  "YANGMAN_LIST_INDEX_DUPLICATE": "Duplicated index",
+  "YANGMAN_LIST_PREV_ITEM": "show previous item",
+  "YANGMAN_LIST_NEXT_ITEM": "show next item",
+  "YANGMAN_SHOW_HIDE_CON": "show / hide container"
 }

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/choice.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/choice.tpl.html
index 0fbefd3e2a9c992ee6086bc8dfaa635a99740b1b..10cb18a85421047f1bfcdc66224dedeaf85f2c41 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/choice.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/choice.tpl.html
@@ -9,7 +9,7 @@
 
         <!-- Expand Icon -->
         <md-icon md-font-set="material-icons" class="top-icon top-element" ng-click="yangChoice.toggleExpanded()">
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/container.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/container.tpl.html
index efa1135d3416acb6d302455611ccf0e5b93f16f0..06464c2266992b525be1fce7d1eaf9c22573ec46 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/container.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/container.tpl.html
@@ -12,7 +12,7 @@
                  class="top-icon top-element pointer"
                  ng-click="yangContainer.toggleExpanded()">
 
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/input.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/input.tpl.html
index c51dd93880088edc64aa584ca2256b10454563e8..8374bd4ede65039abef99af392f57ffa9935ef60 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/input.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/input.tpl.html
@@ -10,7 +10,7 @@
 
         <!-- Expand Icon -->
         <md-icon md-font-set="material-icons" class="top-icon top-element">
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/leaf-list.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/leaf-list.tpl.html
index f5bc82ca468d7ec48eac479f70464c5cedabfa41..9bfb821d95e13094400a759d8545e0788debf5fc 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/leaf-list.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/leaf-list.tpl.html
@@ -9,7 +9,7 @@
 
         <!-- Expand Icon -->
         <md-icon md-font-set="material-icons" class="top-icon top-element" ng-click="yangLeafList.toggleExpanded()">
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/list-filtered-data-top.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/list-filtered-data-top.tpl.html
index 36a2fff83ab0018e59b06832b581e02251c86461..7167146116c972d48614906e8a4813bd4b7cde5a 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/list-filtered-data-top.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/list-filtered-data-top.tpl.html
@@ -1,7 +1,7 @@
 <!-- previous item button -->
 <button ng-click="shiftDisplayPrev()"
         ng-show="showPrevButton()"
-        tooltip="{{ 'LIST_PREV_ITEM' | translate }}"
+        tooltip="{{ 'YANGMAN_LIST_PREV_ITEM' | translate }}"
         class="yangButton iconPrev"></button>
 
 <!-- item list -->
@@ -29,5 +29,5 @@
 <!-- next item button -->
 <button ng-click="shiftDisplayNext('filteredListData')"
         ng-show="showNextButton('filteredListData')"
-        tooltip="{{ 'LIST_NEXT_ITEM' | translate }}"
+        tooltip="{{ 'YANGMAN_LIST_NEXT_ITEM' | translate }}"
         class="yangButton iconNext"></button>

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/list.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/list.tpl.html
index 3882c0d2ccf10353aefa9715eabf5ce65af1d5b0..3095e5bf2457365c7d52ac1503bff4487b008e46 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/list.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/list.tpl.html
@@ -10,7 +10,7 @@
 
         <!-- Expand Icon -->
         <md-icon md-font-set="material-icons" class="top-icon top-element pointer" ng-click="yangList.toggleExpanded()">
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/output.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/output.tpl.html
index 4f4b02e01d5f1b5565a197249345a86588364bf9..efeab7b98c3d617a8dff2b0ab053607de847863f 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/output.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/output.tpl.html
@@ -10,7 +10,7 @@
 
         <!-- Expand Icon -->
         <md-icon md-font-set="material-icons" class="top-icon top-element">
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/rpc.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/rpc.tpl.html
index bbc42a5fbecc80d976680d7b9a2034eb093d032c..bb07658f7234f19f5e5f82758f9b71bcfc562d96 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/rpc.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/config/rpc.tpl.html
@@ -10,7 +10,7 @@
 
         <!-- Expand Icon -->
         <md-icon md-font-set="material-icons" class="top-icon top-element">
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/list-data-top.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/list-data-top.tpl.html
index de1bc7e08b5b435e95e317e468e4baa07a929287..2cf52c9d697c58edaf79360ce6c68391a127aa74 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/list-data-top.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/list-data-top.tpl.html
@@ -1,7 +1,8 @@
 <!-- Previous button -->
-<button ng-click="yangList.shiftDisplayPrev()">
+<button ng-click="yangList.shiftDisplayPrev()"
+        ng-show="yangList.showPrevButton()">
     <md-icon class="material-icons">{{yangList.showPrevButton() ? 'arrow_back' : ''}}</md-icon>
-    <md-tooltip md-direction="top">{{ 'LIST_PREV_ITEM' | translate }}</md-tooltip>
+    <md-tooltip md-direction="top">{{ 'YANGMAN_LIST_PREV_ITEM' | translate }}</md-tooltip>
 </button>
 
 <section ng-repeat="offset in yangList.displayOffsets" class="yangmanModule__right-panel__form__list-item"
@@ -46,5 +47,5 @@
 <button ng-click="yangList.shiftDisplayNext('listData')"
         ng-show="yangList.showNextButton('listData')">
     <md-icon class="material-icons">arrow_forward</md-icon>
-    <md-tooltip md-direction="top">{{ 'LIST_NEXT_ITEM' | translate }}</md-tooltip>
+    <md-tooltip md-direction="top">{{ 'YANGMAN_LIST_NEXT_ITEM' | translate }}</md-tooltip>
 </button>

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/choice.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/choice.tpl.html
index 9f61b9d948e47580473dcdf286bbe6870942ab0d..2be813e3525ad388ebc9442974ffe314ffa9947c 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/choice.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/choice.tpl.html
@@ -10,7 +10,7 @@
 
         <!-- Expand Icon -->
         <md-icon md-font-set="material-icons" class="top-icon top-element" ng-click="yangChoice.toggleExpanded()">
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/container.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/container.tpl.html
index 814b5f83ff260a826a6c1e3bf6c5f0e0e34fac48..df402f96c73422f8d4626664500bb58d636ed312 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/container.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/container.tpl.html
@@ -12,7 +12,7 @@
         <md-icon md-font-set="material-icons"
                  class="top-icon top-element pointer"
                  ng-click="yangContainer.toggleExpanded()">
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/input.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/input.tpl.html
index 7f178fea362d5cf477f56785623c6b94ef66f772..9cb0198de42f0c3e02bdd8dff033869ae48c7d55 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/input.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/input.tpl.html
@@ -11,7 +11,7 @@
 
         <!-- Expand Icon -->
         <md-icon md-font-set="material-icons" class="top-icon top-element">
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/leaf-list.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/leaf-list.tpl.html
index c20e988d97fae5a5c00751fa1c2793ae3e385fbf..3b4df3bf425c7703e5889444352b4a086ee81139 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/leaf-list.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/leaf-list.tpl.html
@@ -10,7 +10,7 @@
 
         <!-- Expand Icon -->
         <md-icon md-font-set="material-icons" class="top-icon top-element" ng-click="yangLeafList.toggleExpanded()">
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/list-filtered-data-top.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/list-filtered-data-top.tpl.html
index 62f1eb8c833a2ecc89ccca22ef57c1da3f2c4564..bd5fa92143727fdda1547f2edc3b7f5195ce61d7 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/list-filtered-data-top.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/list-filtered-data-top.tpl.html
@@ -1,7 +1,7 @@
 <!-- previous item button -->
 <button ng-click="shiftDisplayPrev()"
         ng-show="showPrevButton()"
-        tooltip="{{ 'LIST_PREV_ITEM' | translate }}"
+        tooltip="{{ 'YANGMAN_LIST_PREV_ITEM' | translate }}"
         class="yangButton iconPrev"></button>
 
 <!-- item list -->
@@ -19,5 +19,5 @@
 <!-- next item button -->
 <button ng-click="shiftDisplayNext('filteredListData')"
         ng-show="showNextButton('filteredListData')"
-        tooltip="{{ 'LIST_NEXT_ITEM' | translate }}"
-        class="yangButton iconNext"></button>
\ No newline at end of file
+        tooltip="{{ 'YANGMAN_LIST_NEXT_ITEM' | translate }}"
+        class="yangButton iconNext"></button>

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/list.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/list.tpl.html
index c8cdd8bc977d4a946f37c340b79e1d3f5a2e9b49..05f901d7df3ff7473a2f2cc23b21b952910c9ba4 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/list.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/list.tpl.html
@@ -10,7 +10,7 @@
 
         <!-- Expand Icon -->
         <md-icon md-font-set="material-icons" class="top-icon top-element pointer" ng-click="yangList.toggleExpanded()">
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/output.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/output.tpl.html
index 6b6a30426bf38dfcc2984472929fe371b54c9913..33fe905807aeda2ce0d44ca541a4f2bb1eaf8444 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/output.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/output.tpl.html
@@ -11,7 +11,7 @@
 
         <!-- Expand Icon -->
         <md-icon md-font-set="material-icons" class="top-icon top-element">
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/rpc.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/rpc.tpl.html
index 66424cf586bfd2869c9c34d2c308bf1ab4dd573d..dbf76655d1a0118e4819af74241db5a84383d915 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/rpc.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operational/rpc.tpl.html
@@ -11,7 +11,7 @@
 
         <!-- Expand Icon -->
         <md-icon md-font-set="material-icons" class="top-icon top-element">
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operations/rpc.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operations/rpc.tpl.html
index bbc42a5fbecc80d976680d7b9a2034eb093d032c..bb07658f7234f19f5e5f82758f9b71bcfc562d96 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operations/rpc.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/form/operations/rpc.tpl.html
@@ -10,7 +10,7 @@
 
         <!-- Expand Icon -->
         <md-icon md-font-set="material-icons" class="top-icon top-element">
-            <md-tooltip md-direction="left">{{ 'SHOW_HIDE_CON' | translate }}</md-tooltip>
+            <md-tooltip md-direction="left">{{ 'YANGMAN_SHOW_HIDE_CON' | translate }}</md-tooltip>
             {{node.expanded ? 'keyboard_arrow_down':'keyboard_arrow_right'}}
         </md-icon>