Revision: 20436
http://sourceforge.net/p/jmol/code/20436
Author: hansonr
Date: 2015-04-06 01:18:36 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.2.13_2015.04.05b"
bug fix: language switching not working from popup menu;
bug fix: language bundles not processed in the correct order for variants
bug fix: for (var i in hashArray) {....} broken
Modified Paths:
--------------
branches/v14_2/Jmol/src/org/jmol/console/JmolConsole.java
branches/v14_2/Jmol/src/org/jmol/i18n/GT.java
branches/v14_2/Jmol/src/org/jmol/i18n/Language.java
branches/v14_2/Jmol/src/org/jmol/script/ScriptEval.java
branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_2/Jmol/src/org/jmol/console/JmolConsole.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/console/JmolConsole.java 2015-04-06
01:13:49 UTC (rev 20435)
+++ branches/v14_2/Jmol/src/org/jmol/console/JmolConsole.java 2015-04-06
01:18:36 UTC (rev 20436)
@@ -87,6 +87,7 @@
protected void updateLabels() {
labels = null;
boolean doTranslate = GT.setDoTranslate(true);
+ setViewer(vwr);
defaultMessage = getLabel("default");
setAbstractButtonLabels(menuMap, labels);
setTitle();
Modified: branches/v14_2/Jmol/src/org/jmol/i18n/GT.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/i18n/GT.java 2015-04-06 01:13:49 UTC
(rev 20435)
+++ branches/v14_2/Jmol/src/org/jmol/i18n/GT.java 2015-04-06 01:18:36 UTC
(rev 20436)
@@ -161,8 +161,14 @@
+ " using files for language:" + la + " country:" + la_co
+ " variant:" + la_co_va);
if (!ignoreApplicationBundle)
- addBundles(vwr, "Jmol", la_co_va, la_co, la);
- addBundles(vwr, "JmolApplet", la_co_va, la_co, la);
+ addBundles(vwr, "Jmol", la_co_va, null, null);
+ addBundles(vwr, "JmolApplet", la_co_va, null, null);
+ if (!ignoreApplicationBundle)
+ addBundles(vwr, "Jmol", null, la_co, null);
+ addBundles(vwr, "JmolApplet", null, la_co, null);
+ if (!ignoreApplicationBundle)
+ addBundles(vwr, "Jmol", null, null, la);
+ addBundles(vwr, "JmolApplet", null, null, la);
}
public static Language[] getLanguageList(GT gt) {
@@ -283,7 +289,9 @@
private String getString(String s) {
String trans = null;
if (doTranslate) {
- for (int bundle = resourceCount; --bundle >= 0;) {
+ // order was incorrect -- should be:
+ // la_co_va(app) la_co_va(applet) la_co(app) la_co(applet) la(app)
la(applet)
+ for (int bundle = 0; bundle < resourceCount; bundle++) {
trans = resources[bundle].getString(s);
if (trans != null) {
s = trans;
Modified: branches/v14_2/Jmol/src/org/jmol/i18n/Language.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/i18n/Language.java 2015-04-06 01:13:49 UTC
(rev 20435)
+++ branches/v14_2/Jmol/src/org/jmol/i18n/Language.java 2015-04-06 01:18:36 UTC
(rev 20436)
@@ -25,6 +25,8 @@
package org.jmol.i18n;
+import javajs.util.PT;
+
public class Language {
/**
@@ -148,10 +150,10 @@
for (int i = list.length; --i >= 0;)
if (list[i].code.equalsIgnoreCase(code))
return list[i].code;
- for (int i = list.length; --i >= 0;)
- if (list[i].code.startsWith(code))
- return list[i].code;
+ for (int i = list.length; --i >= 0;)
+ if (list[i].code.startsWith(code))
+ return list[i].code;
return null;
}
-
+
}
\ No newline at end of file
Modified: branches/v14_2/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/script/ScriptEval.java 2015-04-06
01:13:49 UTC (rev 20435)
+++ branches/v14_2/Jmol/src/org/jmol/script/ScriptEval.java 2015-04-06
01:18:36 UTC (rev 20436)
@@ -3526,7 +3526,7 @@
Map<String, SV> m = vl.getMap();
String[] keys = new String[m.keySet().size()];
Arrays.sort(keys);
- bsOrList = m.keySet().toArray(keys);
+ bsOrList = keys;
break;
default:
invArg();
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-04-06
01:13:49 UTC (rev 20435)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-04-06
01:18:36 UTC (rev 20436)
@@ -4,8 +4,14 @@
# THIS IS THE RELEASE BRANCH
# BUG FIXES ONLY, PLEASE
-Jmol.___JmolVersion="14.2.13_2015.04.02"
+Jmol.___JmolVersion="14.2.13_2015.04.05b"
+bug fix: language switching not working from popup menu;
+bug fix: language bundles not processed in the correct order for variants
+bug fix: for (var i in hashArray) {....} broken
+
+JmolVersion="14.2.13_2015.04.02"
+
bug fix: [3 4 5].min should give integer 3, not decimal 3.0 (same with .max)
JmolVersion="14.2.13_2015.04.01b"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
Develop your own process in accordance with the BPMN 2 standard
Learn Process modeling best practices with Bonita BPM through live exercises
http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
