From f17f9bd3a7e901a86dac2e3319f4baee87ed1e0d Mon Sep 17 00:00:00 2001
From: "michal.kovacik" <mikovaci@cisco.com>
Date: Mon, 15 Aug 2016 15:13:55 +0200
Subject: [PATCH] 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>
---
 .../main/resources/yangman/assets/data/locale-en_US.json   | 5 ++++-
 .../yangman/views/rightpanel/form/config/choice.tpl.html   | 2 +-
 .../views/rightpanel/form/config/container.tpl.html        | 2 +-
 .../yangman/views/rightpanel/form/config/input.tpl.html    | 2 +-
 .../views/rightpanel/form/config/leaf-list.tpl.html        | 2 +-
 .../rightpanel/form/config/list-filtered-data-top.tpl.html | 4 ++--
 .../yangman/views/rightpanel/form/config/list.tpl.html     | 2 +-
 .../yangman/views/rightpanel/form/config/output.tpl.html   | 2 +-
 .../yangman/views/rightpanel/form/config/rpc.tpl.html      | 2 +-
 .../yangman/views/rightpanel/form/list-data-top.tpl.html   | 7 ++++---
 .../views/rightpanel/form/operational/choice.tpl.html      | 2 +-
 .../views/rightpanel/form/operational/container.tpl.html   | 2 +-
 .../views/rightpanel/form/operational/input.tpl.html       | 2 +-
 .../views/rightpanel/form/operational/leaf-list.tpl.html   | 2 +-
 .../form/operational/list-filtered-data-top.tpl.html       | 6 +++---
 .../views/rightpanel/form/operational/list.tpl.html        | 2 +-
 .../views/rightpanel/form/operational/output.tpl.html      | 2 +-
 .../yangman/views/rightpanel/form/operational/rpc.tpl.html | 2 +-
 .../yangman/views/rightpanel/form/operations/rpc.tpl.html  | 2 +-
 19 files changed, 28 insertions(+), 24 deletions(-)

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 4b675d80..e0e81607 100644
--- 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 0fbefd3e..10cb18a8 100644
--- 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 efa1135d..06464c22 100644
--- 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 c51dd938..8374bd4e 100644
--- 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 f5bc82ca..9bfb821d 100644
--- 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 36a2fff8..71671461 100644
--- 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 3882c0d2..3095e5bf 100644
--- 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 4f4b02e0..efeab7b9 100644
--- 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 bbc42a5f..bb07658f 100644
--- 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 de1bc7e0..2cf52c9d 100644
--- 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 9f61b9d9..2be813e3 100644
--- 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 814b5f83..df402f96 100644
--- 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 7f178fea..9cb0198d 100644
--- 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 c20e988d..3b4df3bf 100644
--- 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 62f1eb8c..bd5fa921 100644
--- 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 c8cdd8bc..05f901d7 100644
--- 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 6b6a3042..33fe9058 100644
--- 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 66424cf5..dbf76655 100644
--- 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 bbc42a5f..bb07658f 100644
--- 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>
 
-- 
2.36.6