equal
deleted
inserted
replaced
119 iResourceLoaderTable = new Hashtable(); |
119 iResourceLoaderTable = new Hashtable(); |
120 } |
120 } |
121 ResourceLoader rl = (ResourceLoader)iResourceLoaderTable.get(key); |
121 ResourceLoader rl = (ResourceLoader)iResourceLoaderTable.get(key); |
122 if (rl == null) |
122 if (rl == null) |
123 { |
123 { |
124 rl = ResourceLoader.getInstance(textFilename, textPrefix); |
124 if (getLocaleIdQt() == null) |
|
125 { |
|
126 rl = ResourceLoader.getInstance(textFilename, textPrefix); |
|
127 } |
|
128 else |
|
129 { |
|
130 rl = ResourceLoader.getInstance(null, null, textFilename, textPrefix); |
|
131 } |
125 iResourceLoaderTable.put(key, rl); |
132 iResourceLoaderTable.put(key, rl); |
126 } |
133 } |
127 return rl; |
134 return rl; |
128 } |
135 } |
129 |
136 |
132 * |
139 * |
133 * @return Qt locale ID as provided by the platform |
140 * @return Qt locale ID as provided by the platform |
134 */ |
141 */ |
135 protected static String getLocaleIdQt() |
142 protected static String getLocaleIdQt() |
136 { |
143 { |
137 // Change this after Qt localisation files are taken into use. |
144 return ResourceLoader.getLocaleIdQt(); |
138 //return ResourceLoader.getLocaleIdQt(); |
|
139 return null; |
|
140 } |
145 } |
141 |
146 |
142 /*** ----------------------------- PACKAGE ---------------------------- */ |
147 /*** ----------------------------- PACKAGE ---------------------------- */ |
143 /*** ----------------------------- PRIVATE ---------------------------- */ |
148 /*** ----------------------------- PRIVATE ---------------------------- */ |
144 /*** ----------------------------- NATIVE ----------------------------- */ |
149 /*** ----------------------------- NATIVE ----------------------------- */ |