/hg/icedtea-web: Javaws and PolicyEditor made localizable
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Sep 17 12:20:46 UTC 2014
changeset e7f5499a75d3 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e7f5499a75d3
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Sep 17 14:20:31 2014 +0200
Javaws and PolicyEditor made localizable
diffstat:
ChangeLog | 10 ++
Makefile.am | 4 +-
netx/net/sourceforge/jnlp/resources/Messages.properties | 27 +++++++
netx/net/sourceforge/jnlp/util/docprovider/JavaWsTextsProvider.java | 35 ++++++----
netx/net/sourceforge/jnlp/util/docprovider/PolicyEditorTextsProvider.java | 26 ++----
netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/HtmlFormatter.java | 2 +-
6 files changed, 71 insertions(+), 33 deletions(-)
diffs (222 lines):
diff -r d8e057783109 -r e7f5499a75d3 ChangeLog
--- a/ChangeLog Mon Sep 15 14:09:30 2014 -0400
+++ b/ChangeLog Wed Sep 17 14:20:31 2014 +0200
@@ -1,3 +1,13 @@
+2014-09-17 Jiri Vanek <jvanek at redhat.com>
+
+ Javaws and PolicyEditor made localizable
+ * Makefile.am: usage of $TP_TAIL fixed to be correctly $$TP_TAIL
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: added PE and JWS
+ families
+ * netx/net/sourceforge/jnlp/util/docprovider/JavaWsTextsProvider.java: and
+ * netx/net/sourceforge/jnlp/util/docprovider/PolicyEditorTextsProvider.java:
+ all strings moved to properties. Minor reformatting.
+
2014-09-15 Lukasz Dracz <ldracz at redhat.com>
Fix itweb-settings Cache Panel Tooltip
diff -r d8e057783109 -r e7f5499a75d3 Makefile.am
--- a/Makefile.am Mon Sep 15 14:09:30 2014 -0400
+++ b/Makefile.am Wed Sep 17 14:20:31 2014 +0200
@@ -493,9 +493,9 @@
export LANG=$$LANG_ID; \
mkdir $$HTML_DOCS_TARGET_DIR/$$ID ; \
echo "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>" >> $$HTML_DOCS_INDEX ; \
- $$TP_COMMAND html $$HTML_DOCS_TARGET_DIR/$$ID false $TP_TAIL ; \
+ $$TP_COMMAND html $$HTML_DOCS_TARGET_DIR/$$ID false $$TP_TAIL ; \
mkdir $$PLAIN_DOCS_TARGET_DIR/$$ID ; \
- $$TP_COMMAND plain $$PLAIN_DOCS_TARGET_DIR/$$ID 160 false $TP_TAIL; \
+ $$TP_COMMAND plain $$PLAIN_DOCS_TARGET_DIR/$$ID 160 false $$TP_TAIL; \
if [ $$ID == "en" ] ; then \
MAN_DESC=$$MAN_DOCS_TARGET_DIR/man1 ; \
else \
diff -r d8e057783109 -r e7f5499a75d3 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Sep 15 14:09:30 2014 -0400
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Wed Sep 17 14:20:31 2014 +0200
@@ -236,6 +236,33 @@
BFileInfoCopying=The full GPLv2 license of this project can be found in the file COPYING in the IcedTea-Web root directory.
BFileInfoNews=News about releases of this project can be found in the file NEWS in the IcedTea-Web root directory.
+#policyeditor man (note, spaces (especially the one around @@ markup)are important due to man pages markup
+PEintro= - view and modify security policy settings for @BOLD_OPEN at javaws @BOLD_CLOSE at and the @BOLD_OPEN at browser plugin at BOLD_CLOSE@
+PEsynopseP1=policy_file
+PEsynopseP2=url
+PEdescL1=is a GUI application with small command line support to view and edit applet security policy settings used by the icedtea-web implementation \
+of at BOLD_OPEN@ javaws @BOLD_CLOSE at and the @BOLD_OPEN@ browser plugin. @BOLD_CLOSE at It is intended as a simpler, easier to use, and more accessible alternative \
+to the standard @BOLD_OPEN@ JDK Policy Tool. @BOLD_CLOSE at Administrators and power users who need fine grained control over policy files should probably use \
+Policy Tool instead of PolicyEditor.
+PEdescL2=If executed without any arguments, no file is opened, and saving the file will result in a prompt on where to save it. Otherwise, if a file path is given as \
+a command line argument, then that file path will be opened and parsed as policy file.
+PEexampleL1=Show GUI and opens the default policy file.
+PEexampleL2=Show the GUI editor with no file opened.
+
+
+#javaws man (note, spaces (especially the one around @@ markup)are important due to man pages markup
+JWSintro= - a Java Web Start client
+JWSdescL1=is an implementation of a JNLP client. It uses a JNLP (Java Network Launch Protocol) file to securely run a remote Java application or a Java applet. \
+This implementation of {0}is from the IcedTea project and is based on the NetX project.
+JWSdescL2=A JNLP file is an xml file that describes how to securely run a remote Java application or a Java applet.
+JWSoptionsL1=When specifying options, the name of the jnlp file must be the last argument to javaws - all the options must preceede it.
+JWSoptionsL2=The jnlp-file can either be a url or a local path.
+JWSoptionsTitle1=Run options:
+JWSoptionsTitle2=Control options:
+JWSexampleL1=Shows basic help and about informations.
+JWSexampleL2=Shows basic help and about informations in terminal only.
+JWSexampleL3=Will start {0} application, originally from {1}, without downloading it, without headers check and in forced single VM.
+
# Boot options, message should be shorter than this ---------------->
BOUsage=[-run-options] jnlp file
BOUsage2=[-control-options]
diff -r d8e057783109 -r e7f5499a75d3 netx/net/sourceforge/jnlp/util/docprovider/JavaWsTextsProvider.java
--- a/netx/net/sourceforge/jnlp/util/docprovider/JavaWsTextsProvider.java Mon Sep 15 14:09:30 2014 -0400
+++ b/netx/net/sourceforge/jnlp/util/docprovider/JavaWsTextsProvider.java Wed Sep 17 14:20:31 2014 +0200
@@ -41,6 +41,7 @@
import java.io.IOException;
import net.sourceforge.jnlp.OptionsDefinitions;
import net.sourceforge.jnlp.config.PathsAndFiles;
+import net.sourceforge.jnlp.runtime.Translator;
import static net.sourceforge.jnlp.runtime.Translator.R;
import net.sourceforge.jnlp.util.docprovider.formatters.formatters.Formatter;
@@ -58,35 +59,34 @@
@Override
public String getIntroduction() {
return super.getIntroduction()
- + getFormatter().wrapParagraph(getFormatter().process(getId() + " - a Java Web Start client"));
+ + getFormatter().wrapParagraph(getFormatter().process(getId() + " " + Translator.R("JWSintro")));
}
@Override
public String getSynopsis() {
return super.getSynopsis()
- + getFormatter().wrapParagraph(getFormatter().process("@BOLD_OPEN@ " + getId() + " @BOLD_CLOSE@" + R("BOUsage") + "@NWLINE_BOLD_OPEN at javaws @BOLD_CLOSE@" + R("BOUsage2")));
+ + getFormatter().wrapParagraph(getFormatter().process(getFormatter().getBold(" " + getId() + " ") + R("BOUsage") + getFormatter().getBreakAndBold() + getId() + " " + getFormatter().getBoldClosing() + R("BOUsage2")));
}
@Override
public String getDescription() {
return super.getDescription()
+ getFormatter().wrapParagraph(getFormatter().process(
- "@BOLD_OPEN@ " + getId() + " @BOLD_CLOSE@"
- + "is an implementation of a JNLP client. It uses a JNLP (Java Network Launch Protocol) file to securely run a remote Java application or a Java applet. This implementation of"
- + "@BOLD_OPEN@ " + getId() + " @BOLD_CLOSE@" + "is from the IcedTea project and is based on the NetX project."
- + "@NWLINE@@NWLINE@"
- + "A JNLP file is an xml file that describes how to securely run a remote Java application or a Java applet."));
+ getFormatter().getBold(getId() + " ")
+ + Translator.R("JWSdescL1", getFormatter().getBold(getId()+" "))
+ + getFormatter().getNewLine()+ getFormatter().getNewLine()
+ + Translator.R("JWSdescL2")));
}
@Override
public String getOptions() {
String title = super.getOptions();
- String add1 = "When specifying options, the name of the jnlp file must be the last argument to javaws - all the options must preceede it.";
- String add2 = "The jnlp-file can either be a url or a local path.";
+ String add1 = Translator.R("JWSoptionsL1");
+ String add2 = Translator.R("JWSoptionsL2");
String adds = getFormatter().wrapParagraph(add1 + getFormatter().getNewLine() + add2);
- String runtime = getFormatter().getBold("run-options:") + getFormatter().getNewLine()
+ String runtime = getFormatter().getBold(Translator.R("JWSoptionsTitle1")) + getFormatter().getNewLine()
+ optionsToString(OptionsDefinitions.getJavaWsRuntimeOptions());
- String control = getFormatter().getBold("control-options:") + getFormatter().getNewLine()
+ String control = getFormatter().getBold(Translator.R("JWSoptionsTitle2")) + getFormatter().getNewLine()
+ optionsToString(OptionsDefinitions.getJavaWsControlOptions());
return title + adds + getFormatter().wrapParagraph(control) + getFormatter().wrapParagraph(runtime);
}
@@ -95,9 +95,16 @@
public String getExamples() {
return super.getExamples()
+ getFormatter().wrapParagraph(
- getFormatter().getOption(getId() + " -about", " Shows basic help and about informations")
- + getFormatter().getOption(getId() + " -about -headless", " Shows basic help and about informations in commandline")
- + getFormatter().getOption(getId() + " -Xnofork -Xignoreheaders -allowredirect -Xoffline http://mypage.web/dangerous.jnlp", " Will start dangerous.jnlp application, originally form mypage.web, without downloading it, without headers check and in forced single VM"));
+ getFormatter().getOption(getId() + " "
+ + OptionsDefinitions.OPTIONS.ABOUT.option, Translator.R("JWSexampleL1"))
+ + getFormatter().getOption(getId() + " "
+ + OptionsDefinitions.OPTIONS.ABOUT.option + " "
+ + OptionsDefinitions.OPTIONS.HEADLESS.option, Translator.R("JWSexampleL2"))
+ + getFormatter().getOption(getId() + " "
+ + OptionsDefinitions.OPTIONS.NOFORK.option + " "
+ + OptionsDefinitions.OPTIONS.NOHEADERS.option + " "
+ + OptionsDefinitions.OPTIONS.REDIRECT.option + " "
+ + OptionsDefinitions.OPTIONS.OFFLINE.option + " http://mypage.web/dangerous.jnlp", Translator.R("JWSexampleL3", "dangerous.jnlp", "mypage.web")));
}
@Override
diff -r d8e057783109 -r e7f5499a75d3 netx/net/sourceforge/jnlp/util/docprovider/PolicyEditorTextsProvider.java
--- a/netx/net/sourceforge/jnlp/util/docprovider/PolicyEditorTextsProvider.java Mon Sep 15 14:09:30 2014 -0400
+++ b/netx/net/sourceforge/jnlp/util/docprovider/PolicyEditorTextsProvider.java Wed Sep 17 14:20:31 2014 +0200
@@ -39,6 +39,7 @@
import java.io.IOException;
import net.sourceforge.jnlp.OptionsDefinitions;
import net.sourceforge.jnlp.config.PathsAndFiles;
+import net.sourceforge.jnlp.runtime.Translator;
import net.sourceforge.jnlp.util.docprovider.formatters.formatters.Formatter;
/**
@@ -60,29 +61,22 @@
public String getIntroduction() {
return super.getIntroduction()
+ getFormatter().wrapParagraph(
- getFormatter().process(getId() + " - view and modify security policy settings for @BOLD_OPEN at javaws @BOLD_CLOSE at and the @BOLD_OPEN at browser plugin at BOLD_CLOSE@"));
+ getFormatter().process(getId() + " "+Translator.R("PEintro")));
}
@Override
public String getSynopsis() {
return super.getSynopsis()
- + getFormatter().wrapParagraph(getFormatter().process("@BOLD_OPEN@ " + getId() + " @BOLD_CLOSE_NWLINE_BOLD_OPEN@" + getId() + " [-file] @BOLD_CLOSE at policy_file @BOLD_OPEN@[-codebase] @BOLD_CLOSE at url"));
+ + getFormatter().wrapParagraph(getFormatter().process("@BOLD_OPEN@ " + getId() + " @BOLD_CLOSE_NWLINE_BOLD_OPEN@" + getId() + " [-file] @BOLD_CLOSE@"+Translator.R("PEsynopseP1")+" @BOLD_OPEN@[-codebase] @BOLD_CLOSE@"+Translator.R("PEsynopseP2")));
}
@Override
public String getDescription() {
return super.getDescription()
- + getFormatter().wrapParagraph(getFormatter().process("@BOLD_OPEN@ " + getId() + " @BOLD_CLOSE@"
- + "is a GUI application with small command line support to view and edit applet security policy"
- + " settings used by the icedtea-web implementation of"
- + "@BOLD_OPEN@ javaws @BOLD_CLOSE at and the @BOLD_OPEN@ browser plugin. @BOLD_CLOSE at It is intended"
- + " as a simpler, easier to use, and more accessible alternative to the standard"
- + " @BOLD_OPEN@ JDK Policy Tool. @BOLD_CLOSE at Administrators and power users who need fine grained control over"
- + " policy files should probably use Policy Tool instead of PolicyEditor."
- + "@NWLINE@@NWLINE@"
- + "If executed without any arguments, no file is opened, and saving the file will"
- + " result in a prompt on where to save it. Otherwise, if a file path is given as"
- + " a command line argument, then that file path will be opened and parsed as policy file."));
+ + getFormatter().wrapParagraph(getFormatter().process(getFormatter().getBold(getId() + " ")
+ + Translator.R("PEdescL1")
+ + getFormatter().getNewLine() + getFormatter().getNewLine()
+ + Translator.R("PEdescL2")));
}
@Override
@@ -96,13 +90,13 @@
String title = super.getExamples();
String s = "";
if (expandVariables) {
- s = s + getFormatter().getOption(getId() + " -file " + PathsAndFiles.JAVA_POLICY.getFullPath(), "Show GUI and opens the default policy file.");
+ s = s + getFormatter().getOption(getId() + " -file " + PathsAndFiles.JAVA_POLICY.getFullPath(), Translator.R("PEexampleL1"));
} else {
- s = s + getFormatter().getOption(getId() + " -file " + PathsAndFiles.JAVA_POLICY.toString(), "Show GUI and opens the default policy file.");
+ s = s + getFormatter().getOption(getId() + " -file " + PathsAndFiles.JAVA_POLICY.toString(), Translator.R("PEexampleL1"));
}
return title + getFormatter().wrapParagraph(
- getFormatter().getOption(getId(), "Show the GUI editor with no file opened") + s);
+ getFormatter().getOption(getId(), Translator.R("PEexampleL2")) + s);
}
@Override
diff -r d8e057783109 -r e7f5499a75d3 netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/HtmlFormatter.java
--- a/netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/HtmlFormatter.java Mon Sep 15 14:09:30 2014 -0400
+++ b/netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/HtmlFormatter.java Wed Sep 17 14:20:31 2014 +0200
@@ -143,7 +143,7 @@
@Override
public String getOption(String key, String value) {
- return "<li><b>" + key + " </b> - " + process(value) + ".</li>";
+ return "<li><b>" + key + " </b> - " + process(value) + "</li>";
}
}
More information about the distro-pkg-dev
mailing list