echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Translations: Move country names to a new resource bundle

Browse Source
This commit is contained in:
zzz
2013-10-14 15:29:12 +00:00
parent 0c0a25b038
commit 3ec602865d
54 changed files with 15811 additions and 22706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
View File

@ -35,6 +35,7 @@ import net.i2p.router.TunnelPoolSettings;
import net.i2p.router.util.HashDistance; // debug
import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade;
import net.i2p.util.ObjectCounter;
import net.i2p.util.Translate;
import net.i2p.util.VersionComparator;
public class NetDbRenderer {
@ -332,7 +333,7 @@ public class NetDbRenderer {
int num = countries.count(country);
buf.append("<tr><td><img height=\"11\" width=\"16\" alt=\"").append(country.toUpperCase(Locale.US)).append("\"");
buf.append(" src=\"/flags.jsp?c=").append(country).append("\"> ");
buf.append(_(_context.commSystem().getCountryName(country)));
buf.append(getTranslatedCountry(country));
buf.append("</td><td align=\"center\">").append(num).append("</td></tr>\n");
}
buf.append("</table>\n");
@ -349,6 +350,18 @@ public class NetDbRenderer {
out.flush();
}
private static final String COUNTRY_BUNDLE_NAME = "net.i2p.router.countries.messages";
/**
* Countries now in a separate bundle
* @param code two-letter country code
* @since 0.9.9
*/
private String getTranslatedCountry(String code) {
String name = _context.commSystem().getCountryName(code);
return Translate.getString(name, _context, COUNTRY_BUNDLE_NAME);
}
/** sort by translated country name using rules for the current language setting */
private class CountryComparator implements Comparator<String> {
Collator coll;
@ -359,8 +372,8 @@ public class NetDbRenderer {
}
public int compare(String l, String r) {
return coll.compare(_(_context.commSystem().getCountryName(l)),
_(_context.commSystem().getCountryName(r)));
return coll.compare(getTranslatedCountry(l),
getTranslatedCountry(r));
}
}
@ -396,7 +409,7 @@ public class NetDbRenderer {
String country = _context.commSystem().getCountry(info.getIdentity().getHash());
if(country != null) {
buf.append("<img height=\"11\" width=\"16\" alt=\"").append(country.toUpperCase(Locale.US)).append('\"');
buf.append(" title=\"").append(_(_context.commSystem().getCountryName(country))).append('\"');
buf.append(" title=\"").append(getTranslatedCountry(country)).append('\"');
buf.append(" src=\"/flags.jsp?c=").append(country).append("\"> ");
}
for (RouterAddress addr : info.getAddresses()) {