[okapi] push by jhargrav...@gmail.com - add .* rule for translate=no cases in html5, start to fix logic to cat... on 2012-03-02 23:05 GMT

[ok...@googlecode.com]

Revision: c73d5165464e
Author: Jim Hargrave <hargr...@ldschurch.org>
Date: Fri Mar 2 15:06:58 2012
Log: add .* rule for translate=no cases in html5, start to fix logic
to catch
these cases (still broken)
http://code.google.com/p/okapi/source/detail?r=c73d5165464e

Modified:
/okapi/filters/html/src/main/java/net/sf/okapi/filters/html/HtmlFilter.java

/okapi/filters/html/src/main/resources/net/sf/okapi/filters/html/nonwellformedConfiguration.yml

/okapi/filters/html/src/main/resources/net/sf/okapi/filters/html/wellformedConfiguration.yml

/okapi/filters/html/src/test/java/net/sf/okapi/filters/html/HtmlConfigurationTest.java

/okapi/filters/html/src/test/java/net/sf/okapi/filters/html/HtmlSnippetsTest.java

=======================================
---
/okapi/filters/html/src/main/java/net/sf/okapi/filters/html/HtmlFilter.java
Tue Jan 10 09:47:11 2012
+++
/okapi/filters/html/src/main/java/net/sf/okapi/filters/html/HtmlFilter.java
Fri Mar 2 15:06:58 2012
@@ -142,6 +142,7 @@
final Tag tag = (Tag) segment;
boolean inlineTag = false;
if (getConfig().getElementRuleType(tag.getName()) ==
RULE_TYPE.INLINE_ELEMENT
+ || getConfig().getElementRuleType(tag.getName()) ==
RULE_TYPE.INLINE_EXCLUDED_ELEMENT
|| (getEventBuilder().isInsideTextRun() && (tag
.getTagType() == StartTagType.COMMENT || tag
.getTagType() == StartTagType.XML_PROCESSING_INSTRUCTION)))
@@ -163,6 +164,7 @@
RuleType currentState = null;

switch (ruleType) {
+ case INLINE_EXCLUDED_ELEMENT:
case INLINE_ELEMENT:
try {
currentState = getRuleState().popInlineRule();
=======================================
---
/okapi/filters/html/src/main/resources/net/sf/okapi/filters/html/nonwellformedConfiguration.yml
Tue Jan 10 09:47:11 2012
+++
/okapi/filters/html/src/main/resources/net/sf/okapi/filters/html/nonwellformedConfiguration.yml
Fri Mar 2 15:06:58 2012
@@ -351,6 +351,10 @@
ruleTypes: [INLINE]

# Excluded elements
+ '.*':
+ ruleTypes: [EXCLUDE]
+ conditions: [translate, EQUALS, 'no']
+
style:
ruleTypes: [EXCLUDE]

=======================================
---
/okapi/filters/html/src/main/resources/net/sf/okapi/filters/html/wellformedConfiguration.yml
Tue Jan 10 09:47:11 2012
+++
/okapi/filters/html/src/main/resources/net/sf/okapi/filters/html/wellformedConfiguration.yml
Fri Mar 2 15:06:58 2012
@@ -375,6 +375,10 @@
ruleTypes: [INLINE]

# Excluded elements
+ '.*':
+ ruleTypes: [EXCLUDE]
+ conditions: [translate, EQUALS, 'no']
+
style:
ruleTypes: [EXCLUDE]

=======================================
---
/okapi/filters/html/src/test/java/net/sf/okapi/filters/html/HtmlConfigurationTest.java
Thu Jul 1 11:37:33 2010
+++
/okapi/filters/html/src/test/java/net/sf/okapi/filters/html/HtmlConfigurationTest.java
Fri Mar 2 15:06:58 2012
@@ -45,17 +45,17 @@

.getResource("/net/sf/okapi/filters/html/nonwellformedConfiguration.yml");
TaggedFilterConfiguration rules = new TaggedFilterConfiguration(url);
assertTrue(rules.isRuleType("title",
TaggedFilterConfiguration.RULE_TYPE.ATTRIBUTE_TRANS));
- assertEquals(rules.getElementRuleType("title"),
- TaggedFilterConfiguration.RULE_TYPE.TEXT_UNIT_ELEMENT);
- assertEquals(rules.getElementRuleType("abbr"),
- TaggedFilterConfiguration.RULE_TYPE.INLINE_ELEMENT);
- assertEquals(rules.getElementRuleType("area"),
- TaggedFilterConfiguration.RULE_TYPE.ATTRIBUTES_ONLY);
- assertEquals(rules.getElementRuleType("script"),
- TaggedFilterConfiguration.RULE_TYPE.EXCLUDED_ELEMENT);
+ assertEquals(TaggedFilterConfiguration.RULE_TYPE.TEXT_UNIT_ELEMENT,
+ rules.getElementRuleType("title"));
+ assertEquals(TaggedFilterConfiguration.RULE_TYPE.INLINE_EXCLUDED_ELEMENT,
+ rules.getElementRuleType("abbr"));
+ assertEquals(TaggedFilterConfiguration.RULE_TYPE.ATTRIBUTES_ONLY,
+ rules.getElementRuleType("area"));
+ assertEquals(TaggedFilterConfiguration.RULE_TYPE.EXCLUDED_ELEMENT,
+ rules.getElementRuleType("script"));
assertTrue(rules.isRuleType("pre",
TaggedFilterConfiguration.RULE_TYPE.PRESERVE_WHITESPACE));
- assertEquals(rules.getElementRuleType("meta"),
- TaggedFilterConfiguration.RULE_TYPE.ATTRIBUTES_ONLY);
+ assertEquals(TaggedFilterConfiguration.RULE_TYPE.ATTRIBUTES_ONLY,
+ rules.getElementRuleType("meta"));
}

@Test
=======================================
---
/okapi/filters/html/src/test/java/net/sf/okapi/filters/html/HtmlSnippetsTest.java
Tue Feb 21 06:21:41 2012
+++
/okapi/filters/html/src/test/java/net/sf/okapi/filters/html/HtmlSnippetsTest.java
Fri Mar 2 15:06:58 2012
@@ -213,6 +213,12 @@
assertEquals(snippet, generateOutput(getEvents(snippet), snippet,
locEN));
}

+ @Test
+ public void testInlineTranslateNo() {
+ String snippet = "<p>text with a <span translate=\"no\">no-translation
part</span> and more.</p>";
+ assertEquals(snippet, generateOutput(getEvents(snippet), snippet,
locEN));
+ }
+
@Test
public void testMETATag2() {
String snippet = "<meta http-equiv=\"Content-Language\"
content=\"en\"/>";