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

Commits:

2 changed files:

Changes:

  • client-core/src/main/i18n/getters/jaxx.getter
    ... ... @@ -782,6 +782,7 @@ observe.common.TdrObsDto.speciesTab
    782 782 
     observe.common.TdrObsDto.timestampTab
    783 783 
     observe.common.TdrObsDto.title
    784 784 
     observe.common.TransmittingBuoyDto.brand
    785 
    +observe.common.TransmittingBuoyDto.code
    785 786 
     observe.common.TransmittingBuoyDto.noBuoy
    786 787 
     observe.common.TransmittingBuoyDto.ownership
    787 788 
     observe.common.TransmittingBuoyDto.title

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectTransmittingBuoyOperationUI.jcss
    ... ... @@ -40,7 +40,7 @@
    40 40 
     }
    41 41
    42 42 
     #transmittingBuoyOperation1Label {
    43 
    -  i18nProperty:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION};
    43 
    +  i18nProperty:transmittingBuoyOperation;
    44 44 
     }
    45 45
    46 46 
     #transmittingBuoyOperation1 {
    ... ... @@ -50,7 +50,7 @@
    50 50 
     }
    51 51
    52 52 
     #transmittingBuoyType1Label {
    53 
    -  i18nProperty:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE};
    53 
    +  i18nProperty:transmittingBuoyOperation;
    54 54 
     }
    55 55
    56 56 
     #transmittingBuoyType1 {
    ... ... @@ -59,7 +59,7 @@
    59 59 
     }
    60 60
    61 61 
     #ownership1Label {
    62 
    -  i18nProperty:{TransmittingBuoyDto.PROPERTY_OWNERSHIP};
    62 
    +  i18nProperty:ownership;
    63 63 
     }
    64 64
    65 65 
     #ownership1 {
    ... ... @@ -67,8 +67,8 @@
    67 67 
       enabled: {!getHandler().isBalisePose(transmittingBuoy1.getTransmittingBuoyOperation())}
    68 68 
     }
    69 69
    70 
    -#country1Label {
    71 
    -  i18nProperty:{TransmittingBuoyDto.PROPERTY_COUNTRY};
    70 
    +#country1Label {
    71 
    +  i18nProperty:country;
    72 72 
     }
    73 73
    74 74 
     #country1 {
    ... ... @@ -77,7 +77,7 @@
    77 77 
     }
    78 78
    79 79 
     #code1Label {
    80 
    -  i18nProperty:{TransmittingBuoyDto.PROPERTY_CODE};
    80 
    +  i18nProperty:code;
    81 81 
     }
    82 82
    83 83 
     #code1 {
    ... ... @@ -86,7 +86,7 @@
    86 86 
     }
    87 87
    88 88 
     #brand1Label {
    89 
    -  i18nProperty:{TransmittingBuoyDto.PROPERTY_BRAND};
    89 
    +  i18nProperty:brand;
    90 90 
     }
    91 91
    92 92 
     #brand1 {
    ... ... @@ -95,7 +95,7 @@
    95 95 
     }
    96 96
    97 97 
     #transmittingBuoyOperation2Label {
    98 
    -  i18nProperty:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION};
    98 
    +  i18nProperty:transmittingBuoyOperation;
    99 99 
     }
    100 100
    101 101 
     #transmittingBuoyOperation2 {
    ... ... @@ -105,7 +105,7 @@
    105 105 
     }
    106 106
    107 107 
     #transmittingBuoyType2Label {
    108 
    -  i18nProperty:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE};
    108 
    +  i18nProperty:transmittingBuoyType;
    109 109 
     }
    110 110
    111 111 
     #transmittingBuoyType2 {
    ... ... @@ -114,7 +114,7 @@
    114 114 
     }
    115 115
    116 116 
     #ownership2Label {
    117 
    -  i18nProperty:{TransmittingBuoyDto.PROPERTY_OWNERSHIP};
    117 
    +  i18nProperty:ownership;
    118 118 
     }
    119 119
    120 120 
     #ownership2 {
    ... ... @@ -123,7 +123,7 @@
    123 123 
     }
    124 124
    125 125 
     #country2Label {
    126 
    -  i18nProperty:{TransmittingBuoyDto.PROPERTY_COUNTRY};
    126 
    +  i18nProperty:country;
    127 127 
     }
    128 128
    129 129 
     #country2 {
    ... ... @@ -132,7 +132,7 @@
    132 132 
     }
    133 133
    134 134 
     #code2Label {
    135 
    -  i18nProperty:{TransmittingBuoyDto.PROPERTY_CODE};
    135 
    +  i18nProperty:code;
    136 136 
     }
    137 137
    138 138 
     #code2 {
    ... ... @@ -141,7 +141,7 @@
    141 141 
     }
    142 142
    143 143 
     #brand2Label {
    144 
    -  i18nProperty:{TransmittingBuoyDto.PROPERTY_BRAND};
    144 
    +  i18nProperty:brand;
    145 145 
     }
    146 146
    147 147 
     #brand2 {

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.