diff -r 63b81d807542 -r 1f0034e370aa javacommons/utils/javasrc/com/nokia/mj/impl/utils/ErrorMessageBase.java --- a/javacommons/utils/javasrc/com/nokia/mj/impl/utils/ErrorMessageBase.java Thu Sep 02 13:22:59 2010 +0300 +++ b/javacommons/utils/javasrc/com/nokia/mj/impl/utils/ErrorMessageBase.java Fri Sep 17 16:44:34 2010 +0300 @@ -121,7 +121,14 @@ ResourceLoader rl = (ResourceLoader)iResourceLoaderTable.get(key); if (rl == null) { - rl = ResourceLoader.getInstance(textFilename, textPrefix); + if (getLocaleIdQt() == null) + { + rl = ResourceLoader.getInstance(textFilename, textPrefix); + } + else + { + rl = ResourceLoader.getInstance(null, null, textFilename, textPrefix); + } iResourceLoaderTable.put(key, rl); } return rl; @@ -134,9 +141,7 @@ */ protected static String getLocaleIdQt() { - // Change this after Qt localisation files are taken into use. - //return ResourceLoader.getLocaleIdQt(); - return null; + return ResourceLoader.getLocaleIdQt(); } /*** ----------------------------- PACKAGE ---------------------------- */