SF.net SVN: languagetool:[9233] trunk/languagetool

[jaumeortola]

Revision: 9233
          
http://languagetool.svn.sourceforge.net/languagetool/?rev=9233&view=rev
Author:   jaumeortola
Date:     2013-01-26 22:26:10 +0000 (Sat, 26 Jan 2013)
Log Message:
-----------
In languages with only one country code (Breton, Catalan...), the grammar rules 
were not tested (after revision 9213). This is fixed now.

Revision Links:
--------------
    http://languagetool.svn.sourceforge.net/languagetool/?rev=9213&view=rev

Modified Paths:
--------------
    
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/rules/patterns/PatternRuleTest.java
    
trunk/languagetool/languagetool-language-modules/ca/src/main/java/org/languagetool/language/Catalan.java

Modified: 
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/rules/patterns/PatternRuleTest.java
===================================================================
--- 
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/rules/patterns/PatternRuleTest.java
     2013-01-26 22:21:44 UTC (rev 9232)
+++ 
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/rules/patterns/PatternRuleTest.java
     2013-01-26 22:26:10 UTC (rev 9233)
@@ -74,7 +74,7 @@
   /** To be called from language modules. */
   protected void runGrammarRulesFromXmlTest() throws IOException {
     for (final Language lang : Language.REAL_LANGUAGES) {
-      if (skipCountryVariant(lang)) {
+      if (skipCountryVariant(lang) && Language.REAL_LANGUAGES.length>1) {
         System.out.println("Skipping " + lang + " because there are no 
specific rules for that variant");
         continue;
       }
@@ -91,7 +91,7 @@
   private String getGrammarFileName(Language lang) {
     final String shortNameWithVariant = lang.getShortNameWithVariant();
     final String fileName;
-    if (shortNameWithVariant.contains("-") && 
!shortNameWithVariant.endsWith("-ANY")) {
+    if (shortNameWithVariant.contains("-") && 
!shortNameWithVariant.endsWith("-ANY")  && Language.REAL_LANGUAGES.length>1) {
       fileName = lang.getShortName() + "/" + shortNameWithVariant + "/" + 
JLanguageTool.PATTERN_FILE;
     } else {
       fileName = lang.getShortName() + "/" + JLanguageTool.PATTERN_FILE;

Modified: 
trunk/languagetool/languagetool-language-modules/ca/src/main/java/org/languagetool/language/Catalan.java
===================================================================
--- 
trunk/languagetool/languagetool-language-modules/ca/src/main/java/org/languagetool/language/Catalan.java
    2013-01-26 22:21:44 UTC (rev 9232)
+++ 
trunk/languagetool/languagetool-language-modules/ca/src/main/java/org/languagetool/language/Catalan.java
    2013-01-26 22:26:10 UTC (rev 9233)
@@ -66,7 +66,7 @@
 
   @Override
   public String[] getCountryVariants() {
-    return new String[]{"ANY"};
+    return new String[]{"ES"};
   }
   
   @Override

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
Languagetool-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-commits