[Jrisk-cvs] SF.net SVN: jrisk:[587] XcodeTranslationTool
Brought to you by:
yuranet
Menu
▾
▴
[Jrisk-cvs] SF.net SVN: jrisk:[587] XcodeTranslationTool
|
From: <yu...@us...> - 2011-11-18 17:04:34
|
Revision: 587
http://jrisk.svn.sourceforge.net/jrisk/?rev=587&view=rev
Author: yuranet
Date: 2011-11-18 17:04:28 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
final changes
Modified Paths:
--------------
XcodeTranslationTool/lib/TranslationTool.jar
XcodeTranslationTool/src/net/yura/translation/plugins/xcode/Project.java
XcodeTranslationTool/src/net/yura/translation/plugins/xcode/XcodeComm.java
XcodeTranslationTool/src/net/yura/translation/plugins/xcode/XcodeTranslationTool.java
Modified: XcodeTranslationTool/lib/TranslationTool.jar
===================================================================
(Binary files differ)
Modified: XcodeTranslationTool/src/net/yura/translation/plugins/xcode/Project.java
===================================================================
--- XcodeTranslationTool/src/net/yura/translation/plugins/xcode/Project.java 2011-11-18 15:13:59 UTC (rev 586)
+++ XcodeTranslationTool/src/net/yura/translation/plugins/xcode/Project.java 2011-11-18 17:04:28 UTC (rev 587)
@@ -35,7 +35,6 @@
*/
class Project {
- public static final Locale SCREEN_LOCALE = new Locale("screens");
private final Locale DEFAULT;
private final File file, screen;
private final PropertyListConfiguration properties = new PropertyListConfiguration();
@@ -73,7 +72,7 @@
}
public String getProperty(String name, Locale locale) {
- if (SCREEN_LOCALE.equals(locale)) {
+ if (XcodeComm.SCREEN_LOCALE.equals(locale)) {
String s = screens.getProperty(name);
//return s == null ? s : s.replace(',', '\n'); // YURA: why do we need this??
return s;
@@ -174,7 +173,7 @@
}
*/
public void setProperty(String key, Locale l, String value, boolean spellingOnly) throws Exception {
- if (SCREEN_LOCALE.equals(l)) {
+ if (XcodeComm.SCREEN_LOCALE.equals(l)) {
if (value==null || "".equals(value)) {
if ("".equals(value)) {
System.out.println("[WARN] trying to save a empty string to screens key: "+key+" saving null instead");
@@ -294,7 +293,7 @@
}
});
- alist.add(SCREEN_LOCALE);
+ alist.add(XcodeComm.SCREEN_LOCALE);
// add screens locale to the end
Locale l[] = new Locale[alist.size()];
Modified: XcodeTranslationTool/src/net/yura/translation/plugins/xcode/XcodeComm.java
===================================================================
--- XcodeTranslationTool/src/net/yura/translation/plugins/xcode/XcodeComm.java 2011-11-18 15:13:59 UTC (rev 586)
+++ XcodeTranslationTool/src/net/yura/translation/plugins/xcode/XcodeComm.java 2011-11-18 17:04:28 UTC (rev 587)
@@ -23,6 +23,8 @@
public class XcodeComm implements Mtcomm, XcodeCommXtra {
+ public static final Locale SCREEN_LOCALE = new Locale("screens");
+
private Project project;
public Project getProject() {
@@ -249,16 +251,16 @@
name = name + ".";
}
- StringsProperties whatWasTranslated = Project.SCREEN_LOCALE.equals(l)?null:project.getLocalization(l).getTranslations();
+ StringsProperties whatWasTranslated = SCREEN_LOCALE.equals(l)?null:project.getLocalization(l).getTranslations();
Enumeration en = project.propertyNames();
while (en.hasMoreElements()) {
String s = en.nextElement().toString();
if ( (s.equals( realname ) || s.startsWith(name)) && (
// if we are in screens mode, check that the value is not null
- ( Project.SCREEN_LOCALE.equals(l) && project.getProperty(s, Project.SCREEN_LOCALE)==null) ||
+ ( SCREEN_LOCALE.equals(l) && project.getProperty(s, SCREEN_LOCALE)==null) ||
// if we are in a language mode, check we dont have a none-matching translation
- (!Project.SCREEN_LOCALE.equals(l) && !project.getProperty(s, null).equals(whatWasTranslated.getProperty(s)))
+ (!SCREEN_LOCALE.equals(l) && !project.getProperty(s, null).equals(whatWasTranslated.getProperty(s)))
) ) {
return true;
Modified: XcodeTranslationTool/src/net/yura/translation/plugins/xcode/XcodeTranslationTool.java
===================================================================
--- XcodeTranslationTool/src/net/yura/translation/plugins/xcode/XcodeTranslationTool.java 2011-11-18 15:13:59 UTC (rev 586)
+++ XcodeTranslationTool/src/net/yura/translation/plugins/xcode/XcodeTranslationTool.java 2011-11-18 17:04:28 UTC (rev 587)
@@ -124,8 +124,8 @@
try {
if (imported) {
// we use this for saving, as it scans up and down the tree to check if other nodes need to be changed
- String string = mycomm.getMessage(selectedKey, mycomm.getPartners()[0], Project.SCREEN_LOCALE);
- selectedKey.saveMessage(mycomm, mycomm.getPartners()[0], Project.SCREEN_LOCALE, (string==null?"":string)+newNames, getCurrentLocale() );
+ String string = mycomm.getMessage(selectedKey, mycomm.getPartners()[0], XcodeComm.SCREEN_LOCALE);
+ selectedKey.saveMessage(mycomm, mycomm.getPartners()[0], XcodeComm.SCREEN_LOCALE, (string==null?"":string)+newNames, getCurrentLocale() );
// TODO when we update the screens by editing the textarea it does not refresh the top right list
// TODO when we del OR add a message from the top right list it does not update the textarea
@@ -151,9 +151,9 @@
if(list.getSelectedIndex()>=0) {
try {
- String string = mycomm.getMessage(selectedKey, mycomm.getPartners()[0], Project.SCREEN_LOCALE);
+ String string = mycomm.getMessage(selectedKey, mycomm.getPartners()[0], XcodeComm.SCREEN_LOCALE);
string = string.replaceFirst( Pattern.quote( screens[list.getSelectedIndex()] +",") , "");
- selectedKey.saveMessage(mycomm, mycomm.getPartners()[0], Project.SCREEN_LOCALE, "".equals(string)?null:string, getCurrentLocale() );
+ selectedKey.saveMessage(mycomm, mycomm.getPartners()[0], XcodeComm.SCREEN_LOCALE, "".equals(string)?null:string, getCurrentLocale() );
}
catch (Exception ex) {
throw new RuntimeException(ex);
@@ -184,7 +184,7 @@
selectedKey = key;
try {
- String screens1 = mycomm.getMessage(key, null, Project.SCREEN_LOCALE);
+ String screens1 = mycomm.getMessage(key, null, XcodeComm.SCREEN_LOCALE);
if (screens1==null) { screens1=""; } // avoid null pointers
String[] split = screens1.split(",");
@@ -293,7 +293,6 @@
try {
Mtcomm mycomm = new XcodeComm();
- ((XcodeCommXtra)mycomm).setSpellingOnlyChackbox(spellingOnly);
if (mycomm.load()) {
load(mycomm);
@@ -307,11 +306,19 @@
}.start();
}
+ public void load(Mtcomm mycomm1) {
+
+ Mtcomm oldCom = mycomm;
+ super.load(mycomm1);
+ if (oldCom!=mycomm && mycomm instanceof XcodeCommXtra) {
+ ((XcodeCommXtra)mycomm).setSpellingOnlyChackbox(spellingOnly);
+ }
+
+ }
-
public static void main(String[] args) {
String myName = "Xcode";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|