Layout Editor i18n #1828

silverailscolo · 2016-08-18T20:50:21Z

Quite substantial reworking of the 3 Panel interface code
To prevent breaking access to resources, checked all usage in IDE and changed the most obvious ones to point to our basic set in NamedBeanBundle/Bundle/DisplayBundle
Clean up label style in pop ups/panes, respecting intentions of authors
Some German props, more to follow.

Beans Turnout/Sensor/Light/Block etc. ButtonEdit/ButtonCancel

Use NBB key in LayoutEditor with if/else to keep name/type value intact Comment duplicate keys in LE Bundle Move existing translations to NBB

Fix Multisensor property value \n

use existing bundle keys for OK etc. Fix Positionable Item Edit Dialog button bundle names

spelling errors stray copies from other Bundles

move ButtonSet to jmri.NBB to be found

Clean up DisplayBundle Clean up SpeedProfile Bundle button keys and error string Move some keys to NBB Clean up Maintenance strings Fix BlockContentsIcon to use existing NBB keys Mark NOI18N places

Fix ellipsis in Panel popup menus (only when a input dialog follows, never in pane title)

…ditor

Move File/Edit menu keys to NBB, fix method to retrieve File menu in LE Add spacing to LE icon popup menus Text clean up of AppsBundle headers

# Conflicts solved: # java/src/apps/AppsBundle_de.properties # java/src/jmri/ConditionalVariable.java # java/src/jmri/NamedBeanBundle_ja_JP.properties # java/src/jmri/jmrit/Bundle_da.properties # java/src/jmri/jmrit/Bundle_it.properties # java/src/jmri/jmrit/beantable/BeanTableBundle_ca.properties # java/src/jmri/jmrit/beantable/BeanTableBundle_de.properties # java/src/jmri/jmrit/display/DisplayBundle.properties # java/src/jmri/jmrit/display/DisplayBundle_da.properties # java/src/jmri/jmrit/display/DisplayBundle_fr.properties # java/src/jmri/jmrit/display/DisplayBundle_it.properties # java/src/jmri/jmrit/display/DisplayBundle_ja_JP.properties # java/src/jmri/jmrit/display/palette/FamilyItemPanel.java # java/src/jmri/jmrit/display/palette/PaletteBundle.properties

Call color names by Bundle

insert button name as {0} in property delete unused CPE keys in other languages

Clean up of label style in pop ups Some German props Props moved downstream to reuse

silverailscolo · 2016-08-18T20:57:02Z

Preparing for more translations, rather clean up calls so properties can be reused multiple times from different packages than typing a translation for ‘Turnouts’ in 10 places (also: colors, buttons). Fixed a lot of misspelled property keys, which show up as (unused) stray translations. Hope I didn't erase existing stuff, tried to fix it or move it downstream. Will check when adding German. Still a bit of fine tuning to be done, so please label as WIP.

rhwood · 2016-08-18T22:03:04Z

The Bundle class in any package automatically inherits all keys available to the Bundle class that is extended. So for example:

Since jmri.jmrit.display.Bundle extends jmri.jmrit.Bundle, any key made available by jmri.Bundle and jmri.jmrit.Bundle is also available to jmri.jmrit.display.Bundle (because jmri.jmrit.Bundle extends jmri.Bundle). A Bundle class with a "null" name does not provide any keys of its own, but does provide the keys of the Bundle(s) that it extends. A Bundle with a non-null name field provides the keys in the named properties file.

All Bundle classes ultimately extend jmri.Bundle, so anything in jmri/NamedBeanBundle.properties is available to every class in JMRI (i.e., you don't need (or want) the FileMenu key in apps/AppsBundle.properties, since the FileMenu key is also in jmri/NamedBeanBundle.properties).

rhwood · 2016-08-18T22:04:06Z

java/src/apps/AppsBundle.properties

@@ -3,7 +3,7 @@
 # Default properties for the apps package of jmri.

 # general menu items
-#MenuFile = File
+MenuFile = File


This overrides the MenuFile key in jmri/NamedBeanBundle.properties, and should be commented out or removed.

rhwood · 2016-08-18T22:20:10Z

java/src/jmri/jmrit/display/PositionablePropertiesUtil.java

        Color defaultLabelBackground = backgroundColorPanel.getBackground();
        _backgroundcolors = new String[_fontcolors.length + 1];
        for (int i = 0; i < _fontcolors.length; i++) {
            _backgroundcolors[i] = _fontcolors[i];
        }
-        _backgroundcolors[_backgroundcolors.length - 1] = "None";
+        _backgroundcolors[_backgroundcolors.length - 1] = Bundle.getMessage("ColorClear"); // I18N using Bundle.getMessage("ColorClear");


Is this a literal that gets stored in a panel.xml file?

No, it's stores as hasBackground="yes" redBack="255" greenBack="255" blueBack="255" so no problem.
However, in the present code when you choose Clear as the bg color in the popup menu of a Sensor Icon (i.e. to remove a background color), instead it saves as the color of the background (works as expected storing Clear/None with a "Sensor text icon").

rhwood · 2016-08-18T22:37:46Z

@silverailscolo Despite all the comments, thanks for doing this.

silverailscolo · 2016-08-19T06:20:07Z

I used the key inheritance where I could. It's the older method of reading the whole resource at the start and then using rb.getString(key) that breaks when you move the key.
Will look into the issues spotted, thanks for the pointers.

Comment AppsBundle MenuFile/EditFile keys in all translations (checked they're in NBBundle) Tested workings of ColorClear in color popup (en & de)

Remove unused X/Y keys

move left/right keys from Palette to Bundle Clean up LogixTableBundle unused keys

Move FastClock key to NBB, point LogixBndl and LEBndl there Comment out unused keys in DisplayBndl (probably copied from LEBndl)

German translation of ControlPanelBundle keys (50%) Move Length key from several Operations Bundles to jmrit/Bundle Rename LE key from lower case length to Length and use Bundle.getMessage() method Add variable for button title to CPE DrawFrame instruction text

silverailscolo · 2016-08-21T22:16:42Z

java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_ja_JP.properties

-TitleScheduleEdit   = \u4FE1\u53F7\u6A5F {0}\u306E\u30B9\u30B1\u30B8\u30E5\u30FC\u30EB\u7DE8\u96C6
-TitleScheduleAdd    = \u30B5\u30A4\u30C7\u30A3\u30F3\u30B0 {0}\u306E\u30B9\u30B1\u30B8\u30E5\u30FC\u30EB\u3092\u8FFD\u52A0
-TitleSchedulesTable = \u30B9\u30B1\u30B8\u30E5\u30FC\u30EB
+TitleLocationsTable = \u30ed\u30b1\u30fc\u30b7\u30e7\u30f3


I was unaware all these translations were stored as upper case escapes. Following agreed styling, but this will hide the original edits. The real change to each is limited to commenting out the Length key (moved to jmrit.Bundle to be shared with Panels end Tables).

Use elipsis as variable in CPE menu & pane names Remove elipsis from menu item when there is a drop down choice Point Operations panes to Bundle for Length key

Remove empty keys created by IDE Replace german translation "belegt" by more common "besetzt" (not for Warrants) Move Cut/Copy/Paste menu item keys to NBBundle (to be accessible from /display) Put Detection Sensor (translation) as variable in instruction, move key to DisplayBundle Fix Warrant help urls

using Bundle.getMessage

# Conflicts: # java/src/jmri/jmrit/Bundle.properties

Insert button/field names as variables in translations Fix missing/unwanted elipsis Fix Bundle call of length>Length in Track Circuit pane

…ditor

bobjacobsen · 2016-08-26T19:06:37Z

Is this still,work-in-progress (around Bundle use and encoding) or is it ready to merge?

Fix Bundle call of color popup in LE Edit Track Correct label for detection sensor in Palette Some German translations

silverailscolo · 2016-08-26T20:22:22Z

I hope to complete the translation and conversion of the Control Panel Bundle this weekend, after which this may be merged. Prefer to do some more manual testing because of the interdependencies with the other Display interfaces.

Comment out unused Signal keys Fix LE spelling

Fix Circuit Path length unit switch tooltip

silverailscolo · 2016-08-28T06:06:38Z

May be merged, WIP removed.

silverailscolo added 25 commits July 31, 2016 20:26

Replace Display property keys with program-wide Bundle keys for:

bf83675

Beans Turnout/Sensor/Light/Block etc. ButtonEdit/ButtonCancel

Fix spelling of method and variable

1bbfa4f

Use NBB key

3d9e693

i18n of Item Palette ComboBox

015783e

Use NBB key in LayoutEditor with if/else to keep name/type value intact Comment duplicate keys in LE Bundle Move existing translations to NBB

i18n of Display Sensor palette keys

ce5f4ff

Fix Multisensor property value \n

i18n Coordinate Edit pane labels

65cf5c3

use existing bundle keys for OK etc. Fix Positionable Item Edit Dialog button bundle names

Clean up Fr/Jp Display Bundle

36e35d7

spelling errors stray copies from other Bundles

I18N PositionablePopupUtil

ca885ad

Merge branch 'JMRI/master' into eb-layouteditor

e307416

I18N SensorTextEdit pane

c1953ce

move ButtonSet to jmri.NBB to be found

I18N LE Bundle - Error key

6d283be

Clean up LE Bundles

956cd9c

Clean up LE and CPE Bundles

6b0ece9

Clean up DisplayBundle Clean up SpeedProfile Bundle button keys and error string Move some keys to NBB Clean up Maintenance strings Fix BlockContentsIcon to use existing NBB keys Mark NOI18N places

Fix PE i18n call

274e9d5

Fix line endings

b333b72

Merge remote-tracking branch 'JMRI/master' into eb-layouteditor

5c80178

Clean up unused DisplayBundle keys

bc42005

Fix ellipsis in Panel popup menus (only when a input dialog follows, never in pane title)

Merge remote-tracking branch 'origin/eb-layouteditor' into eb-layoute…

51c2d83

…ditor

Clean up unused LayoutEditorBundle keys

be3c6f5

Move File/Edit menu keys to NBB, fix method to retrieve File menu in LE Add spacing to LE icon popup menus Text clean up of AppsBundle headers

Clean up unused DisplayEditor keys

2d61f3f

Call color names by Bundle

i18n of PE Border and Level pop up menus

32b4f43

insert button name as {0} in property delete unused CPE keys in other languages

Rearrange Labels and Border titles in PositionableProperty pane

7403053

Merge remote-tracking branch 'JMRI/master' into eb-layouteditor

853e49e

i18n PositionableProperties (Panels)

46ce28b

Clean up of label style in pop ups Some German props Props moved downstream to reuse

bobjacobsen added the WIP label Aug 18, 2016

rhwood reviewed Aug 18, 2016
View reviewed changes

silverailscolo added 5 commits August 19, 2016 19:47

Fix html in JavaDoc block

784305d

Comment AppsBundle MenuFile/EditFile keys in all translations (checked they're in NBBundle) Tested workings of ColorClear in color popup (en & de)

Point to existing Options key

0036719

Remove unused X/Y keys

i18n of LE Justification

c5039dd

move left/right keys from Palette to Bundle Clean up LogixTableBundle unused keys

i18n of Display & LEditor bundles

563449d

Move FastClock key to NBB, point LogixBndl and LEBndl there Comment out unused keys in DisplayBndl (probably copied from LEBndl)

silverailscolo reviewed Aug 21, 2016
View reviewed changes

silverailscolo added 9 commits August 22, 2016 22:58

Panel Editor German interface translation

70a2401

Use elipsis as variable in CPE menu & pane names Remove elipsis from menu item when there is a drop down choice Point Operations panes to Bundle for Length key

Merge remote-tracking branch 'JMRI/master' into eb-layouteditor

6f69d8b

Fix Cut/Copy?Paste menu in beantables

1fda7f6

using Bundle.getMessage

Fix single quotes in properties

b4917d3

Merge branch 'JMRI/master' into eb-layouteditor

bff27a2

# Conflicts: # java/src/jmri/jmrit/Bundle.properties

German translations

ec4e3a3

Insert button/field names as variables in translations Fix missing/unwanted elipsis Fix Bundle call of length>Length in Track Circuit pane

Merge remote-tracking branch 'origin/eb-layouteditor' into eb-layoute…

a3ae880

…ditor

Merge branch 'JMRI/master' into eb-layouteditor

4b48374

Insert button/field names as variables in translations

fd93bd2

Fix Bundle call of color popup in LE Edit Track Correct label for detection sensor in Palette Some German translations

silverailscolo added 2 commits August 27, 2016 16:56

Use higher level Color and Name keys in Signaling/NX code

6e3cfaa

Comment out unused Signal keys Fix LE spelling

CPE bundle German complete

a1ed14c

Fix Circuit Path length unit switch tooltip

rhwood added this to the 4.5.4 milestone Aug 28, 2016

rhwood added Enhancement and removed WIP labels Aug 28, 2016

rhwood merged commit 830e90d into JMRI:master Aug 28, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Layout Editor i18n #1828

Layout Editor i18n #1828

silverailscolo commented Aug 18, 2016

silverailscolo commented Aug 18, 2016

rhwood commented Aug 18, 2016

rhwood Aug 18, 2016

rhwood Aug 18, 2016

silverailscolo Aug 19, 2016

rhwood commented Aug 18, 2016

silverailscolo commented Aug 19, 2016

silverailscolo Aug 21, 2016

bobjacobsen commented Aug 26, 2016

silverailscolo commented Aug 26, 2016

silverailscolo commented Aug 28, 2016

Layout Editor i18n #1828

Layout Editor i18n #1828

Conversation

silverailscolo commented Aug 18, 2016

silverailscolo commented Aug 18, 2016

rhwood commented Aug 18, 2016

rhwood Aug 18, 2016

Choose a reason for hiding this comment

rhwood Aug 18, 2016

Choose a reason for hiding this comment

silverailscolo Aug 19, 2016

Choose a reason for hiding this comment

rhwood commented Aug 18, 2016

silverailscolo commented Aug 19, 2016

silverailscolo Aug 21, 2016

Choose a reason for hiding this comment

bobjacobsen commented Aug 26, 2016

silverailscolo commented Aug 26, 2016

silverailscolo commented Aug 28, 2016