Revision: 8464
http://languagetool.svn.sourceforge.net/languagetool/?rev=8464&view=rev
Author: dnaber
Date: 2012-11-27 21:20:43 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
[en] less use of "terminology", as suggested by Arle Lommel at
http://lists.w3.org/Archives/Public/public-multilingualweb-lt/2012Nov/0208.html
Modified Paths:
--------------
trunk/JLanguageTool/src/main/java/org/languagetool/rules/WrongWordInContextRule.java
trunk/JLanguageTool/src/main/java/org/languagetool/rules/en/AvsAnRule.java
trunk/JLanguageTool/src/main/java/org/languagetool/rules/en/BritishReplaceRule.java
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/en/en-GB/grammar.xml
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/en/grammar.xml
trunk/JLanguageTool/src/test/java/org/languagetool/MainTest.java
trunk/JLanguageTool/src/test/java/org/languagetool/tools/StringToolsTest.java
Modified:
trunk/JLanguageTool/src/main/java/org/languagetool/rules/WrongWordInContextRule.java
===================================================================
---
trunk/JLanguageTool/src/main/java/org/languagetool/rules/WrongWordInContextRule.java
2012-11-27 19:48:59 UTC (rev 8463)
+++
trunk/JLanguageTool/src/main/java/org/languagetool/rules/WrongWordInContextRule.java
2012-11-27 21:20:43 UTC (rev 8464)
@@ -48,7 +48,7 @@
}
final String filename = getFilename();
contextWordsSet =
loadContextWords(JLanguageTool.getDataBroker().getFromRulesDirAsStream(filename));
- setLocQualityIssueType("terminology");
+ setLocQualityIssueType("misspelling");
}
protected abstract String getFilename();
Modified:
trunk/JLanguageTool/src/main/java/org/languagetool/rules/en/AvsAnRule.java
===================================================================
--- trunk/JLanguageTool/src/main/java/org/languagetool/rules/en/AvsAnRule.java
2012-11-27 19:48:59 UTC (rev 8463)
+++ trunk/JLanguageTool/src/main/java/org/languagetool/rules/en/AvsAnRule.java
2012-11-27 21:20:43 UTC (rev 8464)
@@ -58,7 +58,7 @@
}
requiresA =
loadWords(JLanguageTool.getDataBroker().getFromRulesDirAsStream(FILENAME_A));
requiresAn =
loadWords(JLanguageTool.getDataBroker().getFromRulesDirAsStream(FILENAME_AN));
- setLocQualityIssueType("terminology");
+ setLocQualityIssueType("misspelling");
}
@Override
Modified:
trunk/JLanguageTool/src/main/java/org/languagetool/rules/en/BritishReplaceRule.java
===================================================================
---
trunk/JLanguageTool/src/main/java/org/languagetool/rules/en/BritishReplaceRule.java
2012-11-27 19:48:59 UTC (rev 8463)
+++
trunk/JLanguageTool/src/main/java/org/languagetool/rules/en/BritishReplaceRule.java
2012-11-27 21:20:43 UTC (rev 8464)
@@ -45,7 +45,7 @@
public BritishReplaceRule(final ResourceBundle messages) throws IOException {
super(messages);
- setLocQualityIssueType("terminology");
+ setLocQualityIssueType("locale-violation");
}
@Override
Modified:
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/en/en-GB/grammar.xml
===================================================================
---
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/en/en-GB/grammar.xml
2012-11-27 19:48:59 UTC (rev 8463)
+++
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/en/en-GB/grammar.xml
2012-11-27 21:20:43 UTC (rev 8464)
@@ -30,7 +30,7 @@
<!--
====================================================================== -->
<!-- Possible typos -->
<!--
====================================================================== -->
- <category name="American English phrases" type="terminology">
+ <category name="American English phrases" type="locale-violation">
<rule id="ZIP_CODE_POSTCODE" name="zip code/postcode">
<pattern>
<token>zip</token>
Modified:
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/en/grammar.xml
===================================================================
---
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/en/grammar.xml
2012-11-27 19:48:59 UTC (rev 8463)
+++
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/en/grammar.xml
2012-11-27 21:20:43 UTC (rev 8464)
@@ -38,7 +38,7 @@
<!--
====================================================================== -->
<!-- Possible typos -->
<!--
====================================================================== -->
- <category name="Possible Typos" type="terminology">
+ <category name="Possible Typos" type="misspelling">
<rule id="FEEL_TREE_TO" name="feel tree (free) to">
<pattern>
<token>feel</token>
@@ -79,7 +79,7 @@
<example type="correct">That means that tires <marker>are still
some</marker> of the most important components of your vehicle.</example>
<example type="correct">But it <marker>is still the same</marker>
government.</example>
</rule>
- <rule id="IS_EVEN_WORST" name="is even worst (worse)">
+ <rule id="IS_EVEN_WORST" name="is even worst (worse)" type="grammar">
<pattern>
<token regexp="yes">is|was|were</token>
<token>even</token>
@@ -762,7 +762,7 @@
<example correction="witch hunt" type="incorrect">An anti-Polish
<marker>witch haunt</marker></example>
<example type="correct">An anti-Polish witch hunt</example>
</rule>
- <rule id="YOUR_S" name="your's (yours)">
+ <rule id="YOUR_S" name="your's (yours)" type="typographical">
<pattern>
<token regexp="yes">your|hers|our|their</token>
<token spacebefore="no" regexp="yes">['’]</token>
@@ -773,7 +773,7 @@
<example correction="your|yours" type="incorrect">It's not mine,
it's <marker>your's</marker>.</example>
<example type="correct">It's not mine, it's yours.</example>
</rule>
- <rule id="YOURS_APOSTROPHE" name="Possessive pronoun with apostrophe">
+ <rule id="YOURS_APOSTROPHE" name="Possessive pronoun with apostrophe"
type="typographical">
<pattern>
<token postag="SENT_START" skip="-1"><exception scope="next"
regexp="yes">['’]</exception></token>
<marker>
@@ -1038,7 +1038,7 @@
<example type="correct">I cannot advise you anything.</example>
</rule>
</rulegroup>
- <rule id="ADVICE_ADVISE" name="advice (advise)">
+ <rule id="ADVICE_ADVISE" name="advice (advise)" type="grammar">
<pattern>
<token postag="PRP"><exception postag="PRP"
negate_pos="yes"/></token>
<marker>
@@ -1865,7 +1865,7 @@
<example type="correct">Although I must admit when I look
<marker>at</marker> the paperback...</example>
<example type="incorrect">Although I must admit when I look
<marker>ate</marker> the paperback...</example>
</rule>
- <rule id="A_KNOW_BUG" name="a know (known) bug/problem">
+ <rule id="A_KNOW_BUG" name="a know (known) bug/problem" type="grammar">
<pattern>
<token>a</token>
<marker>
@@ -2423,7 +2423,7 @@
<example type="correct">I had bought this house.</example>
<example type="incorrect">I <marker>had of</marker> bought this
house.</example>
</rule>
- <rule id="ONES" name="ones (one's)">
+ <rule id="ONES" name="ones (one's)" type="typographical">
<pattern>
<token><exception postag="JJ.*"
postag_regexp="yes"></exception></token>
<marker>
@@ -2437,7 +2437,7 @@
<example type="correct">One should always wash one's feet in the
morning.</example>
<example type="incorrect">One should always wash
<marker>ones</marker> feet in the morning.</example>
</rule>
- <rulegroup id="POSSESIVE_APOSTROPHE" name="Possessive apostrophe
error">
+ <rulegroup id="POSSESIVE_APOSTROPHE" name="Possessive apostrophe
error" type="typographical">
<rule>
<pattern>
<token><exception postag="PRP$"></exception></token>
@@ -2639,7 +2639,7 @@
<example type="correct">It is a zero-sum game when wages are held
flat...</example>
</rule>
<!-- hasn't &irregular_verb::word=\0
\1:participle::pivots=\1,\1:participle -->
- <rule id="HASNT_IRREGULAR_VERB" name="hasnt followed by irregular past
tense verb">
+ <rule id="HASNT_IRREGULAR_VERB" name="hasn't followed by irregular
past tense verb">
<pattern>
<token regexp="yes">hasn|weren|hadn|haven</token>
<token spacebefore="no" regexp="yes">['’]</token>
@@ -2651,7 +2651,7 @@
<example type="correct">They haven't awoken before nine in a long
time.</example>
</rule>
<!-- could've &irregular_verb::word=\0
\1:participle::pivots=\1,\1:participle -->
- <rule id="COULDVE_IRREGULAR_VERB" name="Couldve followed by irregular
past tense verb">
+ <rule id="COULDVE_IRREGULAR_VERB" name="Could've followed by irregular
past tense verb">
<pattern>
<token regexp="yes">could|would|should|you|i|we|they</token>
<token spacebefore="no" regexp="yes">['’]</token>
@@ -8188,7 +8188,7 @@
</rule>
</rulegroup>
</category>
- <category name="Collocations" type="terminology">
+ <category name="Collocations" type="grammar">
<rulegroup id="SUPERIOR_THAN" name="Wrong preposition:
'superior/inferior than' (superior/inferior to)">
<rule>
<pattern>
@@ -8784,7 +8784,7 @@
</category>
- <category name="Commonly Confused Words" type="terminology">
+ <category name="Commonly Confused Words" type="misspelling">
<rulegroup id="SITE_SIDE" name="site (side)">
<rule>
<pattern>
@@ -9335,7 +9335,7 @@
</rule>
</rulegroup>
</category>
- <category name="Nonstandard Phrases" type="terminology">
+ <category name="Nonstandard Phrases" type="misspelling">
<rule id="IN_THE_MOMENT" name="in the moment (currently)">
<!-- Typical mistake for German native speakers -->
<pattern>
Modified: trunk/JLanguageTool/src/test/java/org/languagetool/MainTest.java
===================================================================
--- trunk/JLanguageTool/src/test/java/org/languagetool/MainTest.java
2012-11-27 19:48:59 UTC (rev 8463)
+++ trunk/JLanguageTool/src/test/java/org/languagetool/MainTest.java
2012-11-27 21:20:43 UTC (rev 8464)
@@ -285,7 +285,7 @@
assertTrue(output.contains("<error fromy=\"0\" fromx=\"8\" toy=\"0\"
tox=\"10\" ruleId=\"EN_A_VS_AN\" " +
"msg=\"Use 'a' instead of 'an' if the following word doesn't start
with a vowel sound, e.g. 'a sentence', " +
"'a university'\" replacements=\"a\" context=\"This is an test.
This is a test of of language tool. ...\" " +
- "contextoffset=\"8\" offset=\"8\" errorlength=\"2\"
category=\"Miscellaneous\" locqualityissuetype=\"terminology\"/>"));
+ "contextoffset=\"8\" offset=\"8\" errorlength=\"2\"
category=\"Miscellaneous\" locqualityissuetype=\"misspelling\"/>"));
}
public void testGermanFileWithURL() throws Exception {
Modified:
trunk/JLanguageTool/src/test/java/org/languagetool/tools/StringToolsTest.java
===================================================================
---
trunk/JLanguageTool/src/test/java/org/languagetool/tools/StringToolsTest.java
2012-11-27 19:48:59 UTC (rev 8463)
+++
trunk/JLanguageTool/src/test/java/org/languagetool/tools/StringToolsTest.java
2012-11-27 21:20:43 UTC (rev 8464)
@@ -182,7 +182,7 @@
assertTrue(xml.contains(">\n" +
"<error fromy=\"44\" fromx=\"98\" toy=\"45\" tox=\"99\"
ruleId=\"EN_A_VS_AN\" msg=\"myMessage\" " +
"replacements=\"\" context=\"...s is an test...\"
contextoffset=\"8\" offset=\"8\" errorlength=\"2\" " +
- "locqualityissuetype=\"terminology\"/>\n" +
+ "locqualityissuetype=\"misspelling\"/>\n" +
"</matches>\n"));
}
@@ -228,7 +228,7 @@
assertTrue(xml.contains(">\n" +
"<error fromy=\"44\" fromx=\"98\" toy=\"45\" tox=\"99\"
ruleId=\"EN_A_VS_AN\" msg=\"myMessage\" " +
"replacements=\"\" context=\"...s is an test...\"
contextoffset=\"8\" offset=\"8\" errorlength=\"2\"
url=\"http://server.org?id=1&foo=bar\"; " +
- "locqualityissuetype=\"terminology\"/>\n" +
+ "locqualityissuetype=\"misspelling\"/>\n" +
"</matches>\n"));
}
@@ -245,7 +245,7 @@
assertTrue(xml.contains(">\n" +
"<error fromy=\"44\" fromx=\"98\" toy=\"45\" tox=\"99\"
ruleId=\"EN_A_VS_AN\" msg=\"myMessage\" " +
"replacements=\"\" context=\"... is "an test...\"
contextoffset=\"8\" offset=\"9\" errorlength=\"2\" " +
- "locqualityissuetype=\"terminology\"/>\n" +
+ "locqualityissuetype=\"misspelling\"/>\n" +
"</matches>\n"));
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep yourself connected to Go Parallel:
DESIGN Expert tips on starting your parallel project right.
http://goparallel.sourceforge.net
_______________________________________________
Languagetool-commits mailing list
Languagetool-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-commits
