[Git][ultreiaio/ird-observe][develop] 2 commits: Clean i18n keys

15 Jul 2020


      Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
20fa0bb1 by Tony Chemit at 2020-07-15T12:00:53+02:00
Clean i18n keys

- - - - -
01ef1ec9 by Tony Chemit at 2020-07-15T12:35:55+02:00
Optimize i18n keys

- - - - -


13 changed files:

- client-datasource-actions/src/main/i18n/getters/java.getter
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchronizeResources.java
- client-datasource-editor-api/pom.xml
- client-datasource-editor-api/src/main/i18n/getters/java-enumeration.getter
- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentMode.java
- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx
- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java
- client-datasource-editor-ll/src/main/i18n/getters/jaxx.getter
- client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter
- observe-i18n/src/main/i18n/translations/observe_en_GB.properties
- observe-i18n/src/main/i18n/translations/observe_es_ES.properties
- observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
- validation/src/main/i18n/getters/validation-fields.getter


Changes:

=====================================
client-datasource-actions/src/main/i18n/getters/java.getter
=====================================
@@ -124,10 +124,10 @@ observe.actions.synchro.referential.replaceBeforeDeactivate.title
 observe.actions.synchro.referential.replaceBeforeDelete.title
 observe.actions.synchro.referential.task.addToLeft
 observe.actions.synchro.referential.task.addToRight
-observe.actions.synchro.referential.task.deactivateWithReplaceFromLeft
-observe.actions.synchro.referential.task.deactivateWithReplaceFromLeftWithReplacement
-observe.actions.synchro.referential.task.deactivateWithReplaceFromRight
-observe.actions.synchro.referential.task.deactivateWithReplaceFromRightWithReplacement
+observe.actions.synchro.referential.task.deactivateFromLeft
+observe.actions.synchro.referential.task.deactivateFromLeftWithReplacement
+observe.actions.synchro.referential.task.deactivateFromRight
+observe.actions.synchro.referential.task.deactivateFromRightWithReplacement
 observe.actions.synchro.referential.task.deleteFromLeft
 observe.actions.synchro.referential.task.deleteFromRight
 observe.actions.synchro.referential.task.include.properties


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchronizeResources.java
=====================================
@@ -142,8 +142,8 @@ public enum ReferentialSynchronizeResources {
     DEACTIVATE(
             "deactivateFromLeft",
             "deactivateFromRight",
-            n("observe.actions.synchro.referential.task.deactivateWithReplaceFromLeft"),
-            n("observe.actions.synchro.referential.task.deactivateWithReplaceFromRight"),
+            n("observe.actions.synchro.referential.task.deactivateFromLeft"),
+            n("observe.actions.synchro.referential.task.deactivateFromRight"),
             n("observe.actions.synchro.referential.action.deactivateFromLeft.tip"),
             n("observe.actions.synchro.referential.action.deactivateFromRight.tip"),
             ReferentialSynchroModel.DEACTIVATE_LEFT_PROPERTY_NAME,
@@ -155,8 +155,8 @@ public enum ReferentialSynchronizeResources {
     DEACTIVATE_WITH_REPLACEMENT(
             "deactivateFromLeft",
             "deactivateFromRight",
-            n("observe.actions.synchro.referential.task.deactivateWithReplaceFromLeftWithReplacement"),
-            n("observe.actions.synchro.referential.task.deactivateWithReplaceFromRightWithReplacement"),
+            n("observe.actions.synchro.referential.task.deactivateFromLeftWithReplacement"),
+            n("observe.actions.synchro.referential.task.deactivateFromRightWithReplacement"),
             n("observe.actions.synchro.referential.action.deactivateFromLeftWithReplacement.tip"),
             n("observe.actions.synchro.referential.action.deactivateFromRightWithReplacement.tip"),
             ReferentialSynchroModel.DEACTIVATE_LEFT_PROPERTY_NAME,


=====================================
client-datasource-editor-api/pom.xml
=====================================
@@ -280,6 +280,14 @@
                       <enum>fr.ird.observe.client.datasource.editor.wizard.ObstunaAdminAction</enum>
                     </enums>
                   </enumerationSet>
+                  <enumerationSet>
+                    <name>tip</name>
+                    <!--suppress MavenModelInspection -->
+                    <pattern>observe.Id.mode.@NAME@.tip</pattern>
+                    <enums>
+                      <enum>fr.ird.observe.client.datasource.editor.content.ContentMode</enum>
+                    </enums>
+                  </enumerationSet>
                 </enumerationSets>
               </configuration>
             </execution>


=====================================
client-datasource-editor-api/src/main/i18n/getters/java-enumeration.getter
=====================================
@@ -1,3 +1,6 @@
+observe.Id.mode.CREATE.tip
+observe.Id.mode.READ.tip
+observe.Id.mode.UPDATE.tip
 observe.constant.ObstunaAdminAction.CREATE
 observe.constant.ObstunaAdminAction.CREATE.description
 observe.constant.ObstunaAdminAction.SECURITY


=====================================
client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentMode.java
=====================================
@@ -21,6 +21,8 @@
  */
 package fr.ird.observe.client.datasource.editor.content;
 
+import fr.ird.observe.dto.I18nEnumHelper;
+import io.ultreia.java4all.i18n.I18n;
 import org.nuiton.jaxx.runtime.swing.SwingUtil;
 
 import javax.swing.Icon;
@@ -46,6 +48,10 @@ public enum ContentMode {
         return icon == null ? icon = SwingUtil.createActionIcon("mode-" + name().toLowerCase()) : icon;
     }
 
+    public String getTip() {
+        return I18n.t(String.format("observe.Id.mode.%s.tip", name()));
+    }
+
     public String getValidationContext() {
         return name().toLowerCase();
     }


=====================================
client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx
=====================================
@@ -22,10 +22,7 @@
     abstract='true'
     contentContainer='{contentContainer}'
     leftDecoration='{titleLeft}'
-    rightDecoration='{titleRightToolBar}'
-    _READTip='t("observe.Id.mode.read.tip")'
-    _CREATERip='t("observe.Id.mode.create.tip")'
-    _UPDATETip='t("observe.Id.mode.update.tip")'>
+    rightDecoration='{titleRightToolBar}'>
 
   <import>
     fr.ird.observe.client.configuration.ClientConfig


=====================================
client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java
=====================================
@@ -541,14 +541,12 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe
 
     protected final void onModeChanged(ContentMode mode) {
         String tip = null;
-        if (mode != null) {
-            tip = (String) ui.getClientProperty(mode.name() + "Tip");
-        }
-        ui.getTitleRight().setToolTipText(tip);
         Icon icon = null;
         if (mode != null) {
+            tip = mode.getTip();
             icon = mode.getIcon();
         }
+        ui.getTitleRight().setToolTipText(tip);
         ui.getTitleRight().setIcon(icon);
         getModel().setFormFocusOwner(null);
     }


=====================================
client-datasource-editor-ll/src/main/i18n/getters/jaxx.getter
=====================================
@@ -24,7 +24,6 @@ observe.data.Data.timerTimeOnBoard
 observe.data.Data.traceCutOff
 observe.data.Data.vessel
 observe.data.Data.weightMeasureMethod
-observe.data.Sample.action.resetDefaultSizeMeasureType.tip
 observe.data.ll.common.GearUseFeatures.gear
 observe.data.ll.common.GearUseFeatures.generalTab
 observe.data.ll.common.GearUseFeatures.measurementsTab
@@ -97,7 +96,6 @@ observe.data.ll.logbook.Activity.titles
 observe.data.ll.logbook.Activity.vesselActivity
 observe.data.ll.logbook.Activity.wind
 observe.data.ll.logbook.Activity.windDirection
-observe.data.ll.logbook.Activity.windSpeed
 observe.data.ll.logbook.BaitsComposition.action.create
 observe.data.ll.logbook.BaitsComposition.action.create.tip
 observe.data.ll.logbook.BaitsComposition.baitSettingStatus


=====================================
client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter
=====================================
@@ -22,7 +22,6 @@ observe.data.Data.speciesFate
 observe.data.Data.startDate
 observe.data.Data.vessel
 observe.data.Data.weightMeasureMethod
-observe.data.Sample.action.resetDefaultSizeMeasureType.tip
 observe.data.ps.common.GearUseFeatures.action.create.tip
 observe.data.ps.common.GearUseFeatures.action.create.tip.tip
 observe.data.ps.common.GearUseFeatures.gear


=====================================
observe-i18n/src/main/i18n/translations/observe_en_GB.properties
=====================================
The diff for this file was not included because it is too large.

=====================================
observe-i18n/src/main/i18n/translations/observe_es_ES.properties
=====================================
The diff for this file was not included because it is too large.

=====================================
observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
=====================================
The diff for this file was not included because it is too large.

=====================================
validation/src/main/i18n/getters/validation-fields.getter
=====================================
@@ -58,7 +58,6 @@ observe.data.ll.logbook.Activity.startTimeStamp
 observe.data.ll.logbook.Activity.vesselActivity
 observe.data.ll.logbook.Activity.wind
 observe.data.ll.logbook.Activity.windDirection
-observe.data.ll.logbook.Activity.windSpeed
 observe.data.ll.logbook.BaitsComposition.baitSettingStatus
 observe.data.ll.logbook.BaitsComposition.baitType
 observe.data.ll.logbook.BaitsComposition.individualSize



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/149ef8af9d5e00bc630b8aea7...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/149ef8af9d5e00bc630b8aea7...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)