Revision: 9253
http://languagetool.svn.sourceforge.net/languagetool/?rev=9253&view=rev
Author: dnaber
Date: 2013-01-28 21:26:29 +0000 (Mon, 28 Jan 2013)
Log Message:
-----------
use a constant for the message bundle name
Modified Paths:
--------------
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/patterns/FalseFriendRuleLoader.java
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/TestTools.java
trunk/languagetool/languagetool-standalone/src/main/java/org/languagetool/gui/Messages.java
Modified:
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java
===================================================================
---
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java
2013-01-28 20:45:54 UTC (rev 9252)
+++
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java
2013-01-28 21:26:29 UTC (rev 9253)
@@ -82,6 +82,7 @@
public static final String SENTENCE_END_TAGNAME = "SENT_END";
public static final String PARAGRAPH_END_TAGNAME = "PARA_END";
+ public static final String MESSAGE_BUNDLE =
"org.languagetool.MessagesBundle";
/**
* Returns the build date or <code>null</code> if not run from JAR.
@@ -246,13 +247,13 @@
*/
public static ResourceBundle getMessageBundle() {
try {
- final ResourceBundle bundle =
ResourceBundle.getBundle("org.languagetool.MessagesBundle");
+ final ResourceBundle bundle = ResourceBundle.getBundle(MESSAGE_BUNDLE);
final ResourceBundle fallbackBundle = ResourceBundle.getBundle(
- "org.languagetool.MessagesBundle", Locale.ENGLISH);
+ MESSAGE_BUNDLE, Locale.ENGLISH);
return new ResourceBundleWithFallback(bundle, fallbackBundle);
} catch (final MissingResourceException e) {
return ResourceBundle.getBundle(
- "org.languagetool.MessagesBundle", Locale.ENGLISH);
+ MESSAGE_BUNDLE, Locale.ENGLISH);
}
}
@@ -261,24 +262,24 @@
*/
private static ResourceBundle getMessageBundle(final Language lang) {
try {
- ResourceBundle bundle =
ResourceBundle.getBundle("org.languagetool.MessagesBundle",
lang.getLocaleWithCountry());
+ ResourceBundle bundle = ResourceBundle.getBundle(MESSAGE_BUNDLE,
lang.getLocaleWithCountry());
if (!isValidBundleFor(lang, bundle)) {
- bundle = ResourceBundle.getBundle("org.languagetool.MessagesBundle",
lang.getLocale());
+ bundle = ResourceBundle.getBundle(MESSAGE_BUNDLE, lang.getLocale());
if (!isValidBundleFor(lang, bundle)) {
// happens if 'xx' is requested but only a
MessagesBundle_xx_YY.properties exists:
final Language defaultVariant = lang.getDefaultVariant();
if (defaultVariant != null &&
defaultVariant.getCountryVariants().length > 0) {
final Locale locale = new Locale(defaultVariant.getShortName(),
defaultVariant.getCountryVariants()[0]);
- bundle =
ResourceBundle.getBundle("org.languagetool.MessagesBundle", locale);
+ bundle = ResourceBundle.getBundle(MESSAGE_BUNDLE, locale);
}
}
}
final ResourceBundle fallbackBundle = ResourceBundle.getBundle(
- "org.languagetool.MessagesBundle", Locale.ENGLISH);
+ MESSAGE_BUNDLE, Locale.ENGLISH);
return new ResourceBundleWithFallback(bundle, fallbackBundle);
} catch (final MissingResourceException e) {
return ResourceBundle.getBundle(
- "org.languagetool.MessagesBundle", Locale.ENGLISH);
+ MESSAGE_BUNDLE, Locale.ENGLISH);
}
}
Modified:
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/patterns/FalseFriendRuleLoader.java
===================================================================
---
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/patterns/FalseFriendRuleLoader.java
2013-01-28 20:45:54 UTC (rev 9252)
+++
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/patterns/FalseFriendRuleLoader.java
2013-01-28 21:26:29 UTC (rev 9253)
@@ -66,7 +66,7 @@
final List<PatternRule> rules = handler.getRules();
// Add suggestions to each rule:
final ResourceBundle messages = ResourceBundle.getBundle(
- "org.languagetool.MessagesBundle", motherTongue.getLocale());
+ JLanguageTool.MESSAGE_BUNDLE, motherTongue.getLocale());
for (final PatternRule rule : rules) {
final List<String> suggestionMap =
handler.getSuggestionMap().get(rule.getId());
if (suggestionMap != null) {
@@ -121,7 +121,7 @@
public FalseFriendRuleHandler(final Language textLanguage, final Language
motherTongue) {
messages = ResourceBundle.getBundle(
- "org.languagetool.MessagesBundle", motherTongue.getLocale());
+ JLanguageTool.MESSAGE_BUNDLE, motherTongue.getLocale());
formatter = new MessageFormat("");
formatter.setLocale(motherTongue.getLocale());
this.textLanguage = textLanguage;
Modified:
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/TestTools.java
===================================================================
---
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/TestTools.java
2013-01-28 20:45:54 UTC (rev 9252)
+++
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/TestTools.java
2013-01-28 21:26:29 UTC (rev 9253)
@@ -74,7 +74,7 @@
*/
public static ResourceBundle getMessages(String language) {
final ResourceBundle messages = ResourceBundle.getBundle(
- "org.languagetool.MessagesBundle", new Locale(language));
+ JLanguageTool.MESSAGE_BUNDLE, new Locale(language));
return messages;
}
Modified:
trunk/languagetool/languagetool-standalone/src/main/java/org/languagetool/gui/Messages.java
===================================================================
---
trunk/languagetool/languagetool-standalone/src/main/java/org/languagetool/gui/Messages.java
2013-01-28 20:45:54 UTC (rev 9252)
+++
trunk/languagetool/languagetool-standalone/src/main/java/org/languagetool/gui/Messages.java
2013-01-28 21:26:29 UTC (rev 9253)
@@ -1,14 +1,15 @@
package org.languagetool.gui;
+import org.languagetool.JLanguageTool;
+
import java.util.MissingResourceException;
import java.util.ResourceBundle;
public class Messages {
- private static final String BUNDLE_NAME =
"org.languagetool.MessagesBundle"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
+ .getBundle(JLanguageTool.MESSAGE_BUNDLE);
+
private Messages() {
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Languagetool-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-commits
