Mercurial > hg > release > icedtea-web-1.6

changeset 1219:dd9587b9ff15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Messages from TextsProvider moved to properties
author Jiri Vanek <jvanek@redhat.com>
date Fri, 24 Apr 2015 15:00:56 +0200
parents ff7dc55d6b44
children 89429b52cf2b
files ChangeLog netx/net/sourceforge/jnlp/resources/Messages.properties netx/net/sourceforge/jnlp/util/docprovider/ItwebSettingsTextsProvider.java netx/net/sourceforge/jnlp/util/docprovider/PolicyEditorTextsProvider.java netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java
diffstat 5 files changed, 26 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Apr 24 14:56:35 2015 +0200
+++ b/ChangeLog	Fri Apr 24 15:00:56 2015 +0200
@@ -1,3 +1,14 @@
+2015-04-24  Jiri Vanek  <jvanek@redhat.com>
+
+	Messages from TextsProvider moved to properties
+	* netx/net/sourceforge/jnlp/resources/Messages.properties: added family ITWTB
+	with fourproeprties.
+	* netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java: is now using
+	those properties instead of hardcoded values
+	* netx/net/sourceforge/jnlp/util/docprovider/ItwebSettingsTextsProvider.java:
+	* netx/net/sourceforge/jnlp/util/docprovider/PolicyEditorTextsProvider.java:
+	now includes getFilesAppendix in (getFiles)
+
 2015-04-24  Alexandr Kolouch  <skolnag@gmail.com>
 
 	* netx/net/sourceforge/jnlp/resources/Messages.properties: various improvements
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Fri Apr 24 14:56:35 2015 +0200
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Fri Apr 24 15:00:56 2015 +0200
@@ -1020,6 +1020,14 @@
 CBCheckOkSignedOk = Codebase matches codebase manifest attribute, and application is signed. Continuing. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details.
 CBCheckSignedAppletDontMatchException = Signed applets are not allowed to run when their actual Codebase does not match the Codebase specified in their manifest. Expected: {0}. Actual: {1}. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details.
 CBCheckSignedFail = Application Codebase does NOT match the Codebase specified in the application''s manifest, and this application is signed. You are strongly discouraged from running this application. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details.
+ 
+# itweb man base (note, spaces (especially the one around markup) are important due to man pages markup). Only bold  tag is now recognized by ReplacingTextFormatter.
+ITWTBbugs=There aren''t any known bugs. If you come across one, please file it at
+ITWTBdebug=Please run in debug (-verbose switch or itw-settings setting or ICEDTEAPLUGIN_DEBUG variable set to true) \
+ mode and include that output (best is from java console) with URL to jnlp or html file (or the jnlp/html file or  \
+ application itself) when filing out the bug report.
+ITWTBwritten=Written and maintained by the IcedTea contributors.
+ITWTBdirs=Where $XDG_CONFIG_DIR, $XDG_CACHE_DIR and $XDG_RUNTIME_DIR are  set  as ~/.config, ~/.cache and /tmp or /var/tmp if not set.
 
 # itweb-settings man (note, spaces (especially the one around markup) are important due to man pages markup). Only bold  tag is now recognized by ReplacingTextFormatter.
 ITWSintro= - view and modify settings for <B>javaws </B>and the <B>browser plugin</B>
--- a/netx/net/sourceforge/jnlp/util/docprovider/ItwebSettingsTextsProvider.java	Fri Apr 24 14:56:35 2015 +0200
+++ b/netx/net/sourceforge/jnlp/util/docprovider/ItwebSettingsTextsProvider.java	Fri Apr 24 15:00:56 2015 +0200
@@ -119,7 +119,7 @@
 
     @Override
     public String getFiles() {
-        return super.getFiles() + getFiles(PathsAndFiles.getAllItWebSettingsFiles());
+        return super.getFiles() + getFiles(PathsAndFiles.getAllItWebSettingsFiles()) + getFilesAppendix();
 
     }
 
--- a/netx/net/sourceforge/jnlp/util/docprovider/PolicyEditorTextsProvider.java	Fri Apr 24 14:56:35 2015 +0200
+++ b/netx/net/sourceforge/jnlp/util/docprovider/PolicyEditorTextsProvider.java	Fri Apr 24 15:00:56 2015 +0200
@@ -102,7 +102,7 @@
 
     @Override
     public String getFiles() {
-        return super.getFiles() + getFiles(PathsAndFiles.getAllPEFiles());
+        return super.getFiles() + getFiles(PathsAndFiles.getAllPEFiles()) + getFilesAppendix();
 
     }
 
--- a/netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java	Fri Apr 24 14:56:35 2015 +0200
+++ b/netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java	Fri Apr 24 15:00:56 2015 +0200
@@ -155,7 +155,7 @@
 
     protected String getFilesAppendix() {
         if (!expandVariables) {
-            return getFormatter().wrapParagraph("Where $XDG_CONFIG_DIR, $XDG_CACHE_DIR and $XDG_RUNTIME_DIR are  set  as ~/.config, ~/.cache and /tmp or /var/tmp if not set.");
+            return getFormatter().wrapParagraph(Translator.R("ITWTBdirs"));
         } else {
             return "";
         }
@@ -251,16 +251,14 @@
     public String getBugs() {
 
         StringBuilder sb = new StringBuilder();
-        sb.append(getFormatter().process("There arent any known bugs. If you come across one, please file it at"));
+        sb.append(getFormatter().process(Translator.R("ITWTBbugs")+":"));
         sb.append(getFormatter().getNewLine());
         sb.append(getFormatter().getUrl(ITW_BUGS));
         sb.append(getFormatter().getNewLine());
         sb.append(getFormatter().getUrl(ITW_BUGZILLAHOME));
         sb.append(getFormatter().getNewLine());
         sb.append(getFormatter().getNewLine());
-        sb.append(getFormatter().process("Please run in debug (-verbose switch or itw-settings setting or ICEDTEAPLUGIN_DEBUG variable set to true)"));
-        sb.append(getFormatter().process(" mode and include that output (best is from java console) with URL to jnlp or html file"));
-        sb.append(getFormatter().process(" (or the jnlp/html file or application itself)  when filing out the bug report."));
+        sb.append(getFormatter().process(Translator.R("ITWTBdebug")));
         sb.append(getFormatter().getNewLine());
         if (forceTitles) {
             return getFormatter().getTitle(ManFormatter.KnownSections.BUGS) + getFormatter().wrapParagraph(sb.toString());
@@ -273,11 +271,11 @@
         if (forceTitles) {
             return getFormatter().getTitle(ManFormatter.KnownSections.AUTHOR)
                     + getFormatter().wrapParagraph(
-                            getFormatter().process("Written and maintained by the IcedTea contributors")
+                            getFormatter().process(Translator.R("ITWTBdebug"))
                             + getFormatter().getNewLine());
         } else {
             return getFormatter().wrapParagraph(
-                    getFormatter().process("Written and maintained by the IcedTea contributors")
+                    getFormatter().process(Translator.R("ITWTBdebug"))
                     + getFormatter().getNewLine());
         }
     }