- Timestamp:
- 2019-01-05T21:20:11+01:00 (5 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/HelpAction.java
r14641 r14647 100 100 */ 101 101 public static void displayTagHelp(String key, String val) { 102 final String lang = LanguageInfo.getWikiLanguagePrefix( );102 final String lang = LanguageInfo.getWikiLanguagePrefix(LanguageInfo.LocaleType.OSM_WIKI); 103 103 final List<String> pages = Arrays.asList( 104 104 String.format("%sTag:%s=%s", lang, key, val), … … 118 118 */ 119 119 public static void displayRelationHelp(IRelation<?> rel) { 120 final String lang = LanguageInfo.getWikiLanguagePrefix( );120 final String lang = LanguageInfo.getWikiLanguagePrefix(LanguageInfo.LocaleType.OSM_WIKI); 121 121 final List<String> pages = new ArrayList<>(); 122 122 String type = rel.get("type"); … … 140 140 */ 141 141 public static void displayGenericHelp() { 142 final String lang = LanguageInfo.getWikiLanguagePrefix( );142 final String lang = LanguageInfo.getWikiLanguagePrefix(LanguageInfo.LocaleType.OSM_WIKI); 143 143 final List<String> pages = Arrays.asList( 144 144 String.format("%sMap_Features", lang), -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Link.java
r14646 r14647 7 7 import java.util.Arrays; 8 8 import java.util.Collection; 9 import java.util.List; 9 10 import java.util.Optional; 10 11 … … 43 44 if (SwingUtilities.isLeftMouseButton(e)) { 44 45 // Open localized page if exists 45 HelpAction.displayHelp(Arrays.asList(LanguageInfo.getWikiLanguagePrefix() + wiki, wiki)); 46 final List<String> pages = Arrays.asList( 47 LanguageInfo.getWikiLanguagePrefix(LanguageInfo.LocaleType.OSM_WIKI) + wiki, 48 wiki); 49 HelpAction.displayHelp(pages); 46 50 } else { 47 51 super.mouseClicked(e); -
trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java
r14642 r14647 27 27 BASELANGUAGE, 28 28 /** The standard english texts */ 29 ENGLISH 29 ENGLISH, 30 /** The locale prefix on the OSM wiki */ 31 OSM_WIKI, 30 32 } 31 33 … … 45 47 46 48 static String getWikiLanguagePrefix(Locale locale, LocaleType type) { 47 if (type == LocaleType.ENGLISH) 48 return ""; 49 if (type == LocaleType.ENGLISH) { 50 return ""; 51 } else if (type == LocaleType.OSM_WIKI && Locale.ENGLISH.getLanguage().equals(locale.getLanguage())) { 52 return ""; 53 } else if (type == LocaleType.OSM_WIKI && Locale.SIMPLIFIED_CHINESE.equals(locale)) { 54 return "Zh-hans:"; 55 } else if (type == LocaleType.OSM_WIKI && Locale.TRADITIONAL_CHINESE.equals(locale)) { 56 return "Zh-hant:"; 57 } else if (type == LocaleType.OSM_WIKI) { 58 return locale.getLanguage() + ':'; 59 } 49 60 50 61 String code = getJOSMLocaleCode(locale); … … 60 71 return null; 61 72 } else if (code.matches(".+@.+")) { 62 return code.substring(0, 1).toUpperCase(Locale.ENGLISH) + code.substring(1, 2) 63 + '-' + code.substring(3, 4).toUpperCase(Locale.ENGLISH) + code.substring(4) + ':'; 73 return code.substring(0, 1).toUpperCase(Locale.ENGLISH) 74 + code.substring(1, 2) 75 + '-' 76 + code.substring(3, 4).toUpperCase(Locale.ENGLISH) 77 + code.substring(4) 78 + ':'; 64 79 } 65 80 return code.substring(0, 1).toUpperCase(Locale.ENGLISH) + code.substring(1) + ':';
Note:
See TracChangeset
for help on using the changeset viewer.