Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 041b5cd6 by tchemit at 2019-07-29T12:49:21Z optimize i18n - - - - - 17 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddSampleSpeciesSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/AddFloatingObjectPresetUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookRouteAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/CatchUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/wellplan/TripWellPlanUI.jcss - 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 Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -299,16 +299,6 @@ observe.choice.quit observe.choice.replace observe.choice.save observe.choice.useRemoteStorage -observe.common.ActivityLogbookDto.action.goToOpen.short -observe.common.ActivityLogbookDto.action.goToOpen.tip -observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity -observe.common.FloatingObjectReference.action.add -observe.common.FloatingObjectReference.action.add.tip -observe.common.FloatingObjectReference.choose.title -observe.common.RouteLogbookDto.action.goToOpen.short -observe.common.SampleLogbook.action.addSampleSpecies -observe.common.SampleLogbook.action.addSampleSpecies.tip -observe.common.TripLonglineSampleDto.message.not.open observe.common.action.moveBottom observe.common.action.moveBottom.tip observe.common.action.moveDown @@ -422,6 +412,9 @@ observe.data.ll.landing.TripLonglineLanding.action.moves observe.data.ll.landing.TripLonglineLanding.action.moves.tip observe.data.ll.landing.TripLonglineLanding.action.selectTransshipment observe.data.ll.landing.TripLonglineLanding.message.not.open +observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity +observe.data.ll.logbook.ActivityLogbook.action.goToOpen.short +observe.data.ll.logbook.ActivityLogbook.action.goToOpen.tip observe.data.ll.logbook.ActivityLonglineLogbook.action.addSample observe.data.ll.logbook.ActivityLonglineLogbook.action.addSample.tip observe.data.ll.logbook.ActivityLonglineLogbook.action.addSet @@ -487,6 +480,8 @@ observe.data.ll.logbook.HooksCompositionLogbook.table.hookType observe.data.ll.logbook.HooksCompositionLogbook.table.hookType.tip observe.data.ll.logbook.HooksCompositionLogbook.table.proportion observe.data.ll.logbook.HooksCompositionLogbook.table.proportion.tip +observe.data.ll.logbook.SampleLogbook.action.addSampleSpecies +observe.data.ll.logbook.SampleLogbook.action.addSampleSpecies.tip observe.data.ll.logbook.SamplePartLogbook.table.count observe.data.ll.logbook.SamplePartLogbook.table.count.tip observe.data.ll.logbook.SamplePartLogbook.table.length @@ -665,6 +660,9 @@ observe.data.ll.observation.WeightMeasureObs.table.weight observe.data.ll.observation.WeightMeasureObs.table.weight.tip observe.data.ll.observation.WeightMeasureObs.table.weightMeasureType observe.data.ll.observation.WeightMeasureObs.table.weightMeasureType.tip +observe.data.ps.FloatingObjectReference.action.add +observe.data.ps.FloatingObjectReference.action.add.tip +observe.data.ps.FloatingObjectReference.choose.title observe.data.ps.common.GearUseFeatures.delete observe.data.ps.common.GearUseFeatures.table.comment observe.data.ps.common.GearUseFeatures.table.comment.tip @@ -736,6 +734,7 @@ observe.data.ps.logbook.FloatingObject.not.a.reference observe.data.ps.logbook.FloatingObject.notComputed observe.data.ps.logbook.FloatingObject.table.type observe.data.ps.logbook.Route.action.delete.tip +observe.data.ps.logbook.Route.action.goToOpen.short observe.data.ps.logbook.Route.action.goToOpen.tip observe.data.ps.logbook.Route.action.moves observe.data.ps.logbook.Route.action.moves.tip @@ -744,6 +743,7 @@ observe.data.ps.logbook.Sample.action.goToOpen.short observe.data.ps.logbook.Sample.action.goToOpen.tip observe.data.ps.logbook.Sample.action.moves observe.data.ps.logbook.Sample.action.moves.tip +observe.data.ps.logbook.Sample.message.not.open observe.data.ps.logbook.SampleSpeciesSize.table.count observe.data.ps.logbook.SampleSpeciesSize.table.count.tip observe.data.ps.logbook.SampleSpeciesSize.table.sizeClass @@ -1045,6 +1045,7 @@ observe.ui.tree.data.ps.logbook.route.unsaved observe.ui.tree.data.ps.logbook.set.unsaved observe.ui.tree.data.ps.obs.activity.list observe.ui.tree.data.ps.obs.activity.unsaved +observe.ui.tree.data.ps.obs.catches observe.ui.tree.data.ps.obs.floatingObject.unsaved observe.ui.tree.data.ps.obs.nonTargetCatchRelease observe.ui.tree.data.ps.obs.objectObservedSpecies ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -76,9 +76,6 @@ observe.actions.validate.select.mode observe.actions.validate.select.mode.tip observe.actions.validate.select.scope observe.actions.validate.select.scope.tip -observe.common.Sample.action.resetDefaultSizeMeasureType.tip -observe.common.TargetCatchDto.table.well.tip -observe.common.TripLonglineSampleLogbookDto.comment observe.common.description observe.common.directory observe.common.file @@ -686,7 +683,9 @@ observe.data.ps.logbook.Route.title observe.data.ps.logbook.Route.titles observe.data.ps.logbook.Sample.action.create observe.data.ps.logbook.Sample.action.create.tip +observe.data.ps.logbook.Sample.action.resetDefaultSizeMeasureType.tip observe.data.ps.logbook.Sample.bigsWeight +observe.data.ps.logbook.Sample.comment observe.data.ps.logbook.Sample.message.cantAdd observe.data.ps.logbook.Sample.sampleQuality observe.data.ps.logbook.Sample.sampleType @@ -871,6 +870,7 @@ observe.data.ps.wellplan.WellPlan.title observe.data.ps.wellplan.WellPlan.weight observe.data.ps.wellplan.WellPlan.weightCategory observe.data.ps.wellplan.WellPlan.well +observe.data.table.well.tip observe.info.selected.validators observe.info.validation.credentials observe.menu.actions ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/ChooseRelatedObservedActivityUIAction.java ===================================== @@ -47,7 +47,7 @@ public class ChooseRelatedObservedActivityUIAction extends AbstractContentUIActi private final ActivityLonglinePairingResultItemDecorator decorator; public ChooseRelatedObservedActivityUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, n("observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity"), n("observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity"), "data-calcule", ObserveKeyStrokes.KEY_STROKE_CHOOSE_RELATED_OBSERVATION_ACTIVITY); + super(mainUI, ACTION_NAME, n("observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity"), n("observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity"), "data-calcule", ObserveKeyStrokes.KEY_STROKE_CHOOSE_RELATED_OBSERVATION_ACTIVITY); ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); DecoratorService decoratorService = applicationContext.getDecoratorService(); decorator = new ActivityLonglinePairingResultItemDecorator(decoratorService, applicationContext.getConfig().getLocale()); @@ -87,7 +87,7 @@ public class ChooseRelatedObservedActivityUIAction extends AbstractContentUIActi // String continueActionText = t("observe.choice.continue"); // Object[] options = {continueActionText, t("observe.choice.cancel")}; // JPanel panel = new JPanel(new BorderLayout()); -// panel.add(BorderLayout.NORTH, new JLabel(t("observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity.message", +// panel.add(BorderLayout.NORTH, new JLabel(t("observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity.message", // pairingConfig.getLonglineActivityPairingMaxTime(), pairingConfig.getLonglineActivityPairingMaxDistance()))); // panel.add(BorderLayout.CENTER, editor); // @@ -106,7 +106,7 @@ public class ChooseRelatedObservedActivityUIAction extends AbstractContentUIActi // jButton.setEnabled(false); // editor.addPropertyChangeListener("selectedItem", evt -> jButton.setEnabled(evt.getNewValue() != null)); // -// int response = UIHelper.askUser(ObserveSwingApplicationContext.get().getMainUI(), pane, t("observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity.title"), options); +// int response = UIHelper.askUser(ObserveSwingApplicationContext.get().getMainUI(), pane, t("observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity.title"), options); // // ActivityLonglinePairingResultItem newActivityLonglineObs = null; // if (response == 0) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddSampleSpeciesSeineUIAction.java ===================================== @@ -42,7 +42,7 @@ public class AddSampleSpeciesSeineUIAction extends AbstractContentUIAction { public static final String ACTION_NAME = AddSampleSpeciesSeineUIAction.class.getName(); public AddSampleSpeciesSeineUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, t("observe.common.SampleLogbook.action.addSampleSpecies"), t("observe.common.SampleLogbook.action.addSampleSpecies.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_SAMPLE); + super(mainUI, ACTION_NAME, t("observe.data.ll.logbook.SampleLogbook.action.addSampleSpecies"), t("observe.data.ll.logbook.SampleLogbook.action.addSampleSpecies.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_SAMPLE); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java ===================================== @@ -90,7 +90,7 @@ public class AddActivitySeineFloatingObjectUIAction extends AbstractContentUIAct userConfigs.add(b); a.install(b, pane); } - int response = UIHelper.askUser(pane, t("observe.common.FloatingObjectReference.choose.title"), options); + int response = UIHelper.askUser(pane, t("observe.data.ps.FloatingObjectReference.choose.title"), options); Object value = pane.getValue(); if (value instanceof FloatingObjectPreset) { floatingObjectPresetsManager.setReferenceToUse((FloatingObjectPreset) value); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/AddFloatingObjectPresetUIAction.java ===================================== @@ -60,7 +60,7 @@ public class AddFloatingObjectPresetUIAction extends AbstractContentUIAction { private static final Logger log = LogManager.getLogger(AddFloatingObjectPresetUIAction.class); public AddFloatingObjectPresetUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, t("observe.common.FloatingObjectReference.action.add"), t("observe.common.FloatingObjectReference.action.add.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_FLOATING_OBJECT_REFERENCE); + super(mainUI, ACTION_NAME, t("observe.data.ps.FloatingObjectReference.action.add"), t("observe.data.ps.FloatingObjectReference.action.add.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_FLOATING_OBJECT_REFERENCE); } @Override @@ -92,7 +92,7 @@ public class AddFloatingObjectPresetUIAction extends AbstractContentUIAction { } } }); - int response = UIHelper.askUser(pane, t("observe.common.FloatingObjectReference.choose.title"), options); + int response = UIHelper.askUser(pane, t("observe.data.ps.FloatingObjectReference.choose.title"), options); if (response != 0) { // user cancel ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookActivityAction.java ===================================== @@ -38,8 +38,8 @@ public class SelectSeineLogbookActivityAction extends SelectEditDataAction { super(mainUI, ObserveSeineActivityLogbookEditNode.class, (int) 'F', - t("observe.common.ActivityLogbookDto.action.goToOpen.short"), - t("observe.common.ActivityLogbookDto.action.goToOpen.tip")); + t("observe.data.ll.logbook.ActivityLogbook.action.goToOpen.short"), + t("observe.data.ll.logbook.ActivityLogbook.action.goToOpen.tip")); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookRouteAction.java ===================================== @@ -38,7 +38,7 @@ public class SelectSeineLogbookRouteAction extends SelectEditDataAction { super(mainUI, ObserveSeineRouteLogbookEditNode.class, (int) 'E', - t("observe.common.RouteLogbookDto.action.goToOpen.short"), + t("observe.data.ps.logbook.Route.action.goToOpen.short"), t("observe.data.ps.logbook.Route.action.goToOpen.tip")); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/CatchUI.jcss ===================================== @@ -25,5 +25,5 @@ } #wellLabel { - toolTipText:"observe.common.TargetCatchDto.table.well.tip"; + toolTipText:"observe.data.table.well.tip"; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUI.jcss ===================================== @@ -30,7 +30,7 @@ #defaultSizeMeasureType { actionIcon:combobox-reset2; - toolTipText:"observe.common.Sample.action.resetDefaultSizeMeasureType.tip"; + toolTipText:"observe.data.ps.logbook.Sample.action.resetDefaultSizeMeasureType.tip"; enabled:{model.getDefaultSizeMeasureType() != null}; focusable:false; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUI.jcss ===================================== @@ -38,7 +38,7 @@ } #comment { - title:"observe.common.TripLonglineSampleLogbookDto.comment"; + title:"observe.data.ps.logbook.Sample.comment"; } #sampleSpeciesSizeUI { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleUI.jcss ===================================== @@ -29,11 +29,11 @@ } #wellLabel { - toolTipText:"observe.common.TargetCatchDto.table.well.tip"; + toolTipText:"observe.data.table.well.tip"; } #comment { - title:"observe.common.TripLonglineSampleLogbookDto.comment"; + title:"observe.data.ps.logbook.Sample.comment"; } #reopen { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleUIModel.java ===================================== @@ -38,7 +38,7 @@ public class SampleUIModel extends ContentOpenableUIModel<SampleDto, SampleRefer private static final long serialVersionUID = 1L; public SampleUIModel() { - super(SampleDto.class, I18n.n("observe.common.TripLonglineSampleDto.message.not.open")); + super(SampleDto.class, I18n.n("observe.data.ps.logbook.Sample.message.not.open")); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/wellplan/TripWellPlanUI.jcss ===================================== @@ -28,5 +28,5 @@ } #wellLabel { - toolTipText:"observe.common.TargetCatchDto.table.well.tip"; + toolTipText:"observe.data.table.well.tip"; } ===================================== 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. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/041b5cd6a7179ea3231eba07af72... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/041b5cd6a7179ea3231eba07af72... You're receiving this email because of your account on gitlab.com.