Revision: 7285
http://languagetool.svn.sourceforge.net/languagetool/?rev=7285&view=rev
Author: dnaber
Date: 2012-06-07 17:06:43 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
don't show maintainers for language variants, as these are the same as for the
languages without variants (for now)
Modified Paths:
--------------
trunk/JLanguageTool/src/java/org/languagetool/Language.java
trunk/JLanguageTool/src/test/org/languagetool/LanguageTest.java
Modified: trunk/JLanguageTool/src/java/org/languagetool/Language.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/Language.java 2012-06-07
16:53:14 UTC (rev 7284)
+++ trunk/JLanguageTool/src/java/org/languagetool/Language.java 2012-06-07
17:06:43 UTC (rev 7285)
@@ -365,7 +365,7 @@
}
/**
- * Get sorted info about all maintainers to be used in the About dialog.
+ * Get sorted info about all maintainers (without language variants) to be
used in the About dialog.
* @since 0.9.9
* @param messages
* {{@link ResourceBundle} language bundle to translate
@@ -377,7 +377,7 @@
final StringBuilder maintainersInfo = new StringBuilder();
final List<String> toSort = new ArrayList<String>();
for (final Language lang : Language.LANGUAGES) {
- if (lang != Language.DEMO) {
+ if (lang != Language.DEMO && !lang.isVariant()) {
if (lang.getMaintainers() != null) {
final List<String> names = new ArrayList<String>();
for (Contributor contributor : lang.getMaintainers()) {
@@ -396,6 +396,16 @@
return maintainersInfo.toString();
}
+ public boolean isVariant() {
+ for (Language language : LANGUAGES) {
+ final boolean skip =
language.getShortNameWithVariant().equals(getShortNameWithVariant());
+ if (!skip && language.getClass().isAssignableFrom(getClass())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public boolean isExternal() {
return false;
}
Modified: trunk/JLanguageTool/src/test/org/languagetool/LanguageTest.java
===================================================================
--- trunk/JLanguageTool/src/test/org/languagetool/LanguageTest.java
2012-06-07 16:53:14 UTC (rev 7284)
+++ trunk/JLanguageTool/src/test/org/languagetool/LanguageTest.java
2012-06-07 17:06:43 UTC (rev 7285)
@@ -56,5 +56,13 @@
assertEquals(Language.AMERICAN_ENGLISH,
Language.getLanguageForName("American English"));
assertEquals(Language.GERMAN,
Language.getLanguageForName("German"));
}
-
+
+ @Test
+ public void testIsVariant() {
+
assertTrue(Language.getLanguageForShortName("en-US").isVariant());
+ assertFalse(Language.getLanguageForShortName("en").isVariant());
+ assertTrue(Language.getLanguageForShortName("de-CH").isVariant());
+ assertFalse(Language.getLanguageForShortName("de").isVariant());
+ }
+
}
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
