Author: nextgens
Date: 2008-08-19 19:26:40 +0000 (Tue, 19 Aug 2008)
New Revision: 22036
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
trunk/freenet/src/freenet/l10n/L10n.java
Log:
L10n: factor the isDefault() method
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2008-08-19
19:21:44 UTC (rev 22035)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2008-08-19
19:26:40 UTC (rev 22036)
@@ -236,7 +236,7 @@
if(mode >= PageMaker.MODE_ADVANCED){
HTMLNode navigationBar =
ctx.getPageMaker().getInfobox("navbar", l10n("configNavTitle"));
HTMLNode navigationContent =
ctx.getPageMaker().getContentNode(navigationBar).addChild("ul");
-
if(!L10n.getSelectedLanguage().equals(L10n.FALLBACK_DEFAULT))
+
if(!L10n.getSelectedLanguage().equals(L10n.LANGUAGE.getDefault()))
navigationContent.addChild("a", "href",
TranslationToadlet.TOADLET_URL, l10n("contributeTranslation"));
HTMLNode navigationTable =
navigationContent.addChild("table", "class", "config_navigation");
HTMLNode navigationTableRow =
navigationTable.addChild("tr");
Modified: trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
2008-08-19 19:21:44 UTC (rev 22035)
+++ trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
2008-08-19 19:26:40 UTC (rev 22036)
@@ -48,7 +48,7 @@
}
byte[] data = sfs.toOrderedString().getBytes("UTF-8");
MultiValueTable head = new MultiValueTable();
- head.put("Content-Disposition", "attachment;
filename=\"" + L10n.PREFIX +L10n.getSelectedLanguage()+ L10n.OVERRIDE_SUFFIX +
'"');
+ head.put("Content-Disposition", "attachment;
filename=\"" + L10n.getSelectedLanguage().getL10nOverrideFilename()+ '"');
ctx.sendReplyHeaders(200, "Found", head, "text/plain;
charset=utf-8", data.length);
ctx.writeData(data);
return;
Modified: trunk/freenet/src/freenet/l10n/L10n.java
===================================================================
--- trunk/freenet/src/freenet/l10n/L10n.java 2008-08-19 19:21:44 UTC (rev
22035)
+++ trunk/freenet/src/freenet/l10n/L10n.java 2008-08-19 19:26:40 UTC (rev
22036)
@@ -31,8 +31,6 @@
private static final String SUFFIX = ".properties";
private static final String OVERRIDE_SUFFIX = ".override" + SUFFIX;
- public static final LANGUAGE FALLBACK_DEFAULT = LANGUAGE.ENGLISH;
-
/** @see http://www.omniglot.com/language/names.htm */
public enum LANGUAGE {
ENGLISH("en", "English", "eng"),
@@ -88,11 +86,11 @@
return isoCode;
}
- private String getL10nFilename() {
+ public String getL10nFilename() {
return PREFIX.replace ('.',
'/').concat(PREFIX.concat(shortCode.concat(SUFFIX)));
}
- private String getL10nOverrideFilename() {
+ public String getL10nOverrideFilename() {
return L10n.PREFIX + shortCode + L10n.OVERRIDE_SUFFIX;
}
@@ -104,6 +102,10 @@
return result;
}
+
+ public static LANGUAGE getDefault() {
+ return ENGLISH;
+ }
}
private final LANGUAGE selectedLanguage;
@@ -156,7 +158,7 @@
L10n oldClass = currentClass;
LANGUAGE lang =
LANGUAGE.mapToLanguage(selectedLanguage);
if(currentClass == null) {
- currentClass = (oldClass != null ? oldClass :
new L10n(FALLBACK_DEFAULT));
+ currentClass = (oldClass != null ? oldClass :
new L10n(LANGUAGE.getDefault()));
Logger.error(CLASS_NAME, "The requested
translation is not available!" + selectedLanguage);
throw new MissingResourceException("The
requested translation (" + selectedLanguage + ") hasn't been found!",
CLASS_NAME, selectedLanguage);
} else
@@ -242,7 +244,7 @@
public static SimpleFieldSet getDefaultLanguageTranslation() {
synchronized (sync) {
if(fallbackTranslation == null)
- fallbackTranslation =
loadTranslation(FALLBACK_DEFAULT);
+ fallbackTranslation =
loadTranslation(LANGUAGE.getDefault());
return new SimpleFieldSet(fallbackTranslation);
}
@@ -314,7 +316,7 @@
// We instanciate it only if necessary
synchronized (sync) {
if(fallbackTranslation == null)
- fallbackTranslation =
loadTranslation(FALLBACK_DEFAULT);
+ fallbackTranslation =
loadTranslation(LANGUAGE.getDefault());
result = fallbackTranslation.get(key);
}
@@ -374,7 +376,7 @@
public static LANGUAGE getSelectedLanguage() {
synchronized (sync) {
if((currentClass == null) ||
(currentClass.selectedLanguage == null))
- return FALLBACK_DEFAULT;
+ return LANGUAGE.getDefault();
else
return currentClass.selectedLanguage;
}
