details: https://code.openbravo.com/erp/devel/pi/rev/0f39f1cd72c1
changeset: 33436:0f39f1cd72c1
user: Javier Armendáriz <javier.armendariz <at> openbravo.com>
date: Wed Feb 14 18:29:26 2018 +0100
summary: Fixed bug 37907: Internal CSS are included in AD_TextInterfaces
Adding <style> tags along <script> as tags excluded from being parsed for the
Translate class.
diffstat:
src-trl/src/org/openbravo/translate/Translate.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diffs (26 lines):
diff -r e549accfb295 -r 0f39f1cd72c1
src-trl/src/org/openbravo/translate/Translate.java
--- a/src-trl/src/org/openbravo/translate/Translate.java Wed Feb 14
16:54:40 2018 +0100
+++ b/src-trl/src/org/openbravo/translate/Translate.java Wed Feb 14
18:29:26 2018 +0100
@@ -64,6 +64,7 @@
private static final Pattern LETTER_PATTERN = Pattern.compile("[a-zA-Z]");
private static final List<String> translatableExtensions =
Arrays.asList("html", "fo", "srpt",
"jrxml");
+ private static final List<String> EXCLUDED_TAGS = Arrays.asList("script",
"style");
private static final Logger log = Logger.getLogger(Translate.class);
private XMLReader parser;
@@ -314,10 +315,11 @@
* @return True if the element is parseable, false if not.
*/
private boolean isParseable(String tagname) {
- if (tagname.equalsIgnoreCase("script"))
+ String tag = tagname.toLowerCase();
+ if (EXCLUDED_TAGS.contains(tag)) {
return false;
- else if (extension.equalsIgnoreCase("jrxml") &&
!tagname.equalsIgnoreCase("text")
- && !tagname.equalsIgnoreCase("textFieldExpression")) {
+ } else if (extension.equalsIgnoreCase("jrxml") && !tag.equals("text")
+ && !tag.equals("textfieldexpression")) {
return false;
}
return true;
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
