Revision: 7345
http://languagetool.svn.sourceforge.net/languagetool/?rev=7345&view=rev
Author: dnaber
Date: 2012-06-14 20:55:39 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
more consistent language names (for better sorting), e.g. "English (US)"
instead of "American English"
Modified Paths:
--------------
trunk/JLanguageTool/src/java/org/languagetool/language/AmericanEnglish.java
trunk/JLanguageTool/src/java/org/languagetool/language/AustrianGerman.java
trunk/JLanguageTool/src/java/org/languagetool/language/BritishEnglish.java
trunk/JLanguageTool/src/java/org/languagetool/language/SwissGerman.java
trunk/JLanguageTool/src/test/org/languagetool/LanguageTest.java
trunk/JLanguageTool/src/test/org/languagetool/MainTest.java
Modified:
trunk/JLanguageTool/src/java/org/languagetool/language/AmericanEnglish.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/AmericanEnglish.java
2012-06-14 20:49:16 UTC (rev 7344)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/AmericanEnglish.java
2012-06-14 20:55:39 UTC (rev 7345)
@@ -34,7 +34,7 @@
@Override
public final String getName() {
- return "American English";
+ return "English (US)";
}
public List<Class<? extends Rule>> getRelevantRules() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/language/AustrianGerman.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/AustrianGerman.java
2012-06-14 20:49:16 UTC (rev 7344)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/AustrianGerman.java
2012-06-14 20:55:39 UTC (rev 7345)
@@ -27,7 +27,7 @@
@Override
public final String getName() {
- return "Austrian German";
+ return "German (Austria)";
}
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/language/BritishEnglish.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/BritishEnglish.java
2012-06-14 20:49:16 UTC (rev 7344)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/BritishEnglish.java
2012-06-14 20:55:39 UTC (rev 7345)
@@ -35,7 +35,7 @@
@Override
public String getName() {
- return "British English";
+ return "English (GB)";
}
public List<Class<? extends Rule>> getRelevantRules() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/language/SwissGerman.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/SwissGerman.java
2012-06-14 20:49:16 UTC (rev 7344)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/SwissGerman.java
2012-06-14 20:55:39 UTC (rev 7345)
@@ -27,7 +27,7 @@
@Override
public final String getName() {
- return "Swiss German";
+ return "German (Swiss)";
}
}
Modified: trunk/JLanguageTool/src/test/org/languagetool/LanguageTest.java
===================================================================
--- trunk/JLanguageTool/src/test/org/languagetool/LanguageTest.java
2012-06-14 20:49:16 UTC (rev 7344)
+++ trunk/JLanguageTool/src/test/org/languagetool/LanguageTest.java
2012-06-14 20:55:39 UTC (rev 7345)
@@ -55,7 +55,7 @@
@Test
public void testGetLanguageForName() {
- assertEquals(Language.AMERICAN_ENGLISH,
Language.getLanguageForName("American English"));
+ assertEquals(Language.AMERICAN_ENGLISH,
Language.getLanguageForName("English (US)"));
assertEquals(Language.GERMAN, Language.getLanguageForName("German"));
}
Modified: trunk/JLanguageTool/src/test/org/languagetool/MainTest.java
===================================================================
--- trunk/JLanguageTool/src/test/org/languagetool/MainTest.java 2012-06-14
20:49:16 UTC (rev 7344)
+++ trunk/JLanguageTool/src/test/org/languagetool/MainTest.java 2012-06-14
20:55:39 UTC (rev 7345)
@@ -432,7 +432,7 @@
String[] args = new String[] {"-l", "en-US", input.getAbsolutePath()};
Main.main(args);
String output = new String(this.out.toByteArray());
- assertTrue(output.indexOf("Expected text language: American English") ==
0);
+ assertTrue(output.indexOf("Expected text language: English (US)") == 0);
assertTrue(output.contains("HUNSPELL_RULE"));
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Languagetool-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
