equal
deleted
inserted
replaced
128 locale = locale.equals(Locale.ROOT) ? Locale.ENGLISH : locale; |
128 locale = locale.equals(Locale.ROOT) ? Locale.ENGLISH : locale; |
129 String[][] ret = super.getZoneStrings(locale); |
129 String[][] ret = super.getZoneStrings(locale); |
130 |
130 |
131 // Fill in for the empty names. |
131 // Fill in for the empty names. |
132 // English names are prefilled for performance. |
132 // English names are prefilled for performance. |
133 if (locale.getLanguage() != "en") { |
133 if (!locale.equals(Locale.ENGLISH) && |
|
134 !locale.equals(Locale.US)) { |
134 for (int zoneIndex = 0; zoneIndex < ret.length; zoneIndex++) { |
135 for (int zoneIndex = 0; zoneIndex < ret.length; zoneIndex++) { |
135 deriveFallbackNames(ret[zoneIndex], locale); |
136 deriveFallbackNames(ret[zoneIndex], locale); |
136 } |
137 } |
137 } |
138 } |
138 return ret; |
139 return ret; |