| Index: trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/Namespace.java |
| — | — | @@ -25,6 +25,8 @@ |
| 26 | 26 | public static final int PROJECT_TALK = 5; |
| 27 | 27 | public static final int IMAGE = 6; |
| 28 | 28 | public static final int IMAGE_TALK = 7; |
| | 29 | + public static final int FILE= 6; |
| | 30 | + public static final int FILE_TALK = 7; |
| 29 | 31 | public static final int MEDIAWIKI = 8; |
| 30 | 32 | public static final int MEDIAWIKI_TALK = 9; |
| 31 | 33 | public static final int TEMPLATE = 10; |
| — | — | @@ -119,7 +121,10 @@ |
| 120 | 122 | if (nsp==NONE) throw new MissingResourceException("invalid namespace key: "+k, Namespace.class.getName(), n); |
| 121 | 123 | String v = p.getProperty(k); |
| 122 | 124 | |
| 123 | | - ns.addNamespace(nsp, v); |
| | 125 | + String[] vv = v.split("\\s*\\|\\s*"); |
| | 126 | + for (String vn: vv) { |
| | 127 | + ns.addNamespace(nsp, vn); |
| | 128 | + } |
| 124 | 129 | } |
| 125 | 130 | |
| 126 | 131 | return ns; |
| — | — | @@ -163,7 +168,7 @@ |
| 164 | 169 | * localized namespace names and custom namespaces and aliases. |
| 165 | 170 | */ |
| 166 | 171 | private static int valueOf(String k) { |
| 167 | | - k = k.toUpperCase().trim(); |
| | 172 | + k = k.toUpperCase().trim().replace(' ', '_'); |
| 168 | 173 | |
| 169 | 174 | if (k.equals("NONE")) return NONE; |
| 170 | 175 | if (k.equals("MEDIA")) return MEDIA; |
| — | — | @@ -176,6 +181,8 @@ |
| 177 | 182 | if (k.equals("PROJECT_TALK")) return PROJECT_TALK; |
| 178 | 183 | if (k.equals("IMAGE")) return IMAGE; |
| 179 | 184 | if (k.equals("IMAGE_TALK")) return IMAGE_TALK; |
| | 185 | + if (k.equals("FILE")) return FILE; |
| | 186 | + if (k.equals("FILE_TALK")) return FILE_TALK; |
| 180 | 187 | if (k.equals("MEDIAWIKI")) return MEDIAWIKI; |
| 181 | 188 | if (k.equals("MEDIAWIKI_TALK")) return MEDIAWIKI_TALK; |
| 182 | 189 | if (k.equals("TEMPLATE")) return TEMPLATE; |
| Index: trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/wikis/Namespaces_enwiki.properties |
| — | — | @@ -6,10 +6,10 @@ |
| 7 | 7 | 2=User |
| 8 | 8 | 3=User talk |
| 9 | 9 | |
| 10 | | -4=Wikipedia |
| | 10 | +4=Wikipedia|WP |
| 11 | 11 | 5=Wikipedia_talk |
| 12 | | -6=Image |
| 13 | | -7=Image_talk |
| | 12 | +6=Image|File |
| | 13 | +7=Image_talk|File_talk |
| 14 | 14 | 8=MediaWiki |
| 15 | 15 | 9=MediaWiki_talk |
| 16 | 16 | |
| Index: trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/wikis/Namespaces_frwiki.properties |
| — | — | @@ -8,8 +8,8 @@ |
| 9 | 9 | |
| 10 | 10 | 4=Wikip�dia |
| 11 | 11 | 5=Discussion Wikip�dia |
| 12 | | -6=Image |
| 13 | | -7=Discussion Image |
| | 12 | +6=Image|Fichier |
| | 13 | +7=Discussion Image|Discussion Fichier |
| 14 | 14 | 8=MediaWiki |
| 15 | 15 | 9=Discussion MediaWiki |
| 16 | 16 | |
| Index: trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/wikis/Namespaces_nlwiki.properties |
| — | — | @@ -7,8 +7,8 @@ |
| 8 | 8 | |
| 9 | 9 | 4=Wikipedia |
| 10 | 10 | 5=Overleg_Wikipedia |
| 11 | | -6=Afbeelding |
| 12 | | -7=Overleg_afbeelding |
| | 11 | +6=Afbeelding|Bestand |
| | 12 | +7=Overleg_afbeelding|Overleg_bestand |
| 13 | 13 | 8=MediaWiki |
| 14 | 14 | 9=Overleg_MediaWiki |
| 15 | 15 | |
| Index: trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/wikis/Namespaces_nowiki.properties |
| — | — | @@ -8,8 +8,8 @@ |
| 9 | 9 | 4=Wikipedia |
| 10 | 10 | |
| 11 | 11 | 5=Wikipedia-diskusjon |
| 12 | | -6=Bilde |
| 13 | | -7=Bildediskusjon |
| | 12 | +6=Bilde|Fil |
| | 13 | +7=Bildediskusjon|Fildiskusjon |
| 14 | 14 | 8=MediaWiki |
| 15 | 15 | 9=MediaWiki-diskusjon |
| 16 | 16 | |
| Index: trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/wikis/Namespaces_ndswiki.properties |
| — | — | @@ -7,8 +7,8 @@ |
| 8 | 8 | |
| 9 | 9 | 4=Wikipedia |
| 10 | 10 | 5=Wikipedia Diskuschoon |
| 11 | | -6=Bild |
| 12 | | -7=Bild Diskuschoon |
| | 11 | +6=Bild|Datei |
| | 12 | +7=Bild Diskuschoon|Datei Diskuschoon |
| 13 | 13 | 8=MediaWiki |
| 14 | 14 | 9=MediaWiki Diskuschoon |
| 15 | 15 | |
| Index: trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/wikis/Namespaces_dewiki.properties |
| — | — | @@ -6,10 +6,10 @@ |
| 7 | 7 | 2=Benutzer |
| 8 | 8 | 3=Benutzer_Diskussion |
| 9 | 9 | |
| 10 | | -4=Wikipedia |
| | 10 | +4=Wikipedia|WP |
| 11 | 11 | 5=Wikipedia Diskussion |
| 12 | | -6=Bild |
| 13 | | -7=Bild Diskussion |
| | 12 | +6=Bild|Datei |
| | 13 | +7=Bild Diskussion|Datei Diskussion |
| 14 | 14 | 8=MediaWiki |
| 15 | 15 | 9=MediaWiki Diskussion |
| 16 | 16 | |