branch develop-5.x updated (66b7da1 -> 7636482)
This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 66b7da1 Une exception apparait si on ouvre l'assistant de changement de connexion et qu'on annule (Fixes #8966) new fc5dab8 le calendrier reste en anglais (fixes #8952) new 7636482 Le libellé observe.common.label a sauté (fixes #8951) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7636482bcffdde447944efc8751a87065a9d4427 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 13:21:40 2017 +0100 Le libellé observe.common.label a sauté (fixes #8951) commit fc5dab89924cf44cb564f1139238142dbd4b22d3 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 13:17:45 2017 +0100 le calendrier reste en anglais (fixes #8952) Summary of changes: .../ird/observe/application/swing/decoration/DecoratorService.java | 5 +++++ .../resources/i18n/application-swing-decoration_en_GB.properties | 1 + .../resources/i18n/application-swing-decoration_es_ES.properties | 1 + .../resources/i18n/application-swing-decoration_fr_FR.properties | 1 + .../observe/application/swing/ui/content/ContentUIInitializer.java | 1 + 5 files changed, 9 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit fc5dab89924cf44cb564f1139238142dbd4b22d3 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 13:17:45 2017 +0100 le calendrier reste en anglais (fixes #8952) --- .../ird/observe/application/swing/ui/content/ContentUIInitializer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java index d673053..8b9634a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java @@ -527,6 +527,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E if (log.isDebugEnabled()) { log.debug("disable JXDatePicker editor" + picker.getName()); } + picker.setLocale(ObserveSwingApplicationContext.get().getConfig().getLocale()); picker.getEditor().setEditable(false); JXMonthView monthView = new JXMonthView(); monthView.setLowerBound(DateUtil.createDate(1, 1, 1970)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 7636482bcffdde447944efc8751a87065a9d4427 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 13:21:40 2017 +0100 Le libellé observe.common.label a sauté (fixes #8951) --- .../ird/observe/application/swing/decoration/DecoratorService.java | 5 +++++ .../resources/i18n/application-swing-decoration_en_GB.properties | 1 + .../resources/i18n/application-swing-decoration_es_ES.properties | 1 + .../resources/i18n/application-swing-decoration_fr_FR.properties | 1 + 4 files changed, 8 insertions(+) diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java index ce03954..e6c11e3 100644 --- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java @@ -155,6 +155,7 @@ import java.util.Locale; import java.util.Map; import static org.nuiton.i18n.I18n.l; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -169,6 +170,10 @@ public class DecoratorService extends DecoratorProvider { public static final String HAULING_IDENTIFIER = "haulingIdentifier"; public static final String TRIP_CONTEXT = "Trip"; + static { + n("observe.common.label"); + } + /** la locale du referentiel. */ private ReferentialLocale referentialLocale; diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties index 65c5ae6..5b7ec0b 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties @@ -4,6 +4,7 @@ observe.common.gps.gpsPoint=Gps point observe.common.haulingIdentifier=Hauling identifier observe.common.homeId=Home id observe.common.inconnu=Unknown +observe.common.label=Label observe.common.lengthWeightFormula=Length weight formula observe.common.nocode=Nocode observe.common.none=None diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties index c7996a7..2f20c45 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties @@ -4,6 +4,7 @@ observe.common.gps.gpsPoint=Punto GPS observe.common.haulingIdentifier=Arrastre observe.common.homeId=Identificador observe.common.inconnu=desconocido +observe.common.label=Redacción observe.common.lengthWeightFormula=Relación de peso observe.common.nocode=codigo ausente observe.common.none=Ninguno diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties index f11aac4..333258a 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties @@ -4,6 +4,7 @@ observe.common.gps.gpsPoint=Point GPS observe.common.haulingIdentifier=Virage observe.common.homeId=Identifiant observe.common.inconnu=inconnu +observe.common.label=Libellé observe.common.lengthWeightFormula=Relation Poids observe.common.nocode=code absent observe.common.none=Aucun -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm