Changeset 1496

Timestamp:

11/30/08 02:27:49 (5 weeks ago)

Author:

bderenzi

Message:

Now checks to make sure that all locales have a translation for any given itext item.

Files:

• branches/dev/javarosa/org.javarosa.xform/src/org/javarosa/xform/parse/XFormParser.java (modified) (1 diff)

branches/dev/javarosa/org.javarosa.xform/src/org/javarosa/xform/parse/XFormParser.java

@@ -547 +547 @@
         private static boolean hasITextMapping (FormDef form, String textID) {
                 Localizer l = form.getLocalizer();
-                return l.hasMapping(l.getDefaultLocale(), textID);
+                
+                // 30.Nov BWD - Fixing bug.  Previously it only checked for the default locale
+                // that's not good enough since everything that calls this method expects it to
+                // ensure there is a translation for all locales.
+                String locales[] = l.getAvailableLocales();
+                boolean answer = true;
+                for( int i=0; i<locales.length; i++ )
+                        answer = l.hasMapping(locales[i], textID) && answer;
+                return answer;
         }