Merge branch 'ebourg-master' into develop

Author: tofi86

CHANGELOG.md

@@ -2,6 +2,7 @@ ChangeLog
 ---------
 
 ### v1.1.0 (Work-In-Progress)
+* Localization of messages (English, German, French) (fixes #27 / PR #30, Thanks to @ebourg for his contribution)
 * Improve the version of Java reported in the error messages (fixes #28)
 * Send to java.com when the version of Java installed is too old (fixes #29)
 

README.md

@@ -15,12 +15,12 @@ Whilst developing some Java apps for Mac OS X I was facing the problem of suppor
   * Apple Java 1.5/1.6: `/System/Library/Java/JavaVirtualMachines/`
   * Oracle JRE 1.7/1.8: `/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/`
   * Oracle JDK 1.7/1.8: `/System/Library/Java/JavaVirtualMachines/`
- 
+
 2. Mac Apps built with tools designed for Apple's Java (like Apple's JarBundler or the [ANT task "Jarbundler"](http://informagen.com/JarBundler/)) won't work on Macs with Oracle Java 7 and no Apple Java installed.
   * This is because the Apple `JavaApplicationStub` only works for Apple's Java and their `Info.plist` style to store Java properties.
   * To support Oracle Java 7 you would need to built a separate App package with Oracles [ANT task "Appbundler"](https://java.net/projects/appbundler).
   * Thus you would need the user to know which Java distribution he has installed on his Mac. Not very user friendly...
- 
+
 3. Oracle uses a different syntax to store Java properties in the applications `Info.plist` file. A Java app packaged as a Mac app with Oracles Appbundler also needs a different `JavaApplicationStub` and therefore won't work on systems with Apple's Java...
 
 4. Starting with Mac OS X 10.10 *(Yosemite)*, app packages won't open up anymore if they contain the *deprecated* Plist `Java` dictionary. This isn't confirmed by Apple, but [issue #9](https://github.com/tofi86/universalJavaApplicationStub/issues/9) leads to this assumption:
@@ -76,6 +76,7 @@ If none of these could be found or executed, an applescript error dialog is show
 
 ![Error Dialog No Java Found](/docs/java-error.png?raw=true)
 
+Messages are localized and displayed either in English (Default), French or German. Language contributions are very welcome!
 
 What you need to do
 -------------------
@@ -92,7 +93,7 @@ Download the latest JarBundler release [from its github repo](https://github.com
 
 :exclamation: **Attention:**
 > Using an older version of JarBundler (e.g. [old JarBundler ≤ v2.3](http://informagen.com/JarBundler/) or [new JarBundler ≤ v3.2](https://github.com/UltraMixer/JarBundler)) might result in [issue #9](https://github.com/tofi86/universalJavaApplicationStub/issues/9) *(Mac OS X 10.10 asking to install deprecated Apple JRE 6 instead of using a newer Java version)*
-> 
+>
 > If you don't want to care about compatibility issues between OS X and Java versions, make sure to use the [latest JarBundler version ≥ 3.3](https://github.com/UltraMixer/JarBundler/releases)
 
 Then place the `universalJavaApplicationStub` from this repo in your build resources folder and link it in your ANT task (attribute `stubfile`). Don't forget to set the newly introduced `useJavaXKey` option:
@@ -104,7 +105,7 @@ Then place the `universalJavaApplicationStub` from this repo in your build resou
 	stubfile="${resources.dir}/universalJavaApplicationStub"
 	useJavaXKey="true"
 	... >
-	
+
 </jarbundler>
 ```
 
@@ -122,7 +123,7 @@ Just place the `universalJavaApplicationStub` from this repo in your build resou
 	icon="${resources.dir}/icon.icns"
 	executableName="${resources.dir}/universalJavaApplicationStub"
 	... >
-	
+
 </appbundler>
 ```
 

src/universalJavaApplicationStub

@@ -140,7 +140,7 @@ if [ $exitcode -eq 0 ]; then
 
 	# read the Java WorkingDirectory
 	JVMWorkDir=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:WorkingDirectory" "${InfoPlistFile}" 2> /dev/null | xargs`
-	
+
 	# set Working Directory based upon Plist info
 	if [[ ! -z ${JVMWorkDir} ]]; then
 		WorkingDirectory="${JVMWorkDir}"
@@ -212,15 +212,15 @@ else
 	# replace occurences of $APP_ROOT with its content
 	JVMOptions=`eval "echo ${JVMOptions}"`
 
-	# read the ClassPath in either Array or String style 
-	JVMClassPath_RAW=`/usr/libexec/PlistBuddy -c "print JVMClassPath" "${InfoPlistFile}" 2> /dev/null` 
-	if [[ $JVMClassPath_RAW == *Array* ]] ; then 
-		JVMClassPath=.`/usr/libexec/PlistBuddy -c "print JVMClassPath" "${InfoPlistFile}" 2> /dev/null | grep "    " | sed 's/^ */:/g' | tr -d '\n' | xargs` 
-	elif [[ ! -z ${JVMClassPath_RAW} ]] ; then 
-		JVMClassPath=${JVMClassPath_RAW} 
-	else 
-		#default: fallback to OracleJavaFolder 
-		JVMClassPath="${JavaFolder}/*"  
+	# read the ClassPath in either Array or String style
+	JVMClassPath_RAW=`/usr/libexec/PlistBuddy -c "print JVMClassPath" "${InfoPlistFile}" 2> /dev/null`
+	if [[ $JVMClassPath_RAW == *Array* ]] ; then
+		JVMClassPath=.`/usr/libexec/PlistBuddy -c "print JVMClassPath" "${InfoPlistFile}" 2> /dev/null | grep "    " | sed 's/^ */:/g' | tr -d '\n' | xargs`
+	elif [[ ! -z ${JVMClassPath_RAW} ]] ; then
+		JVMClassPath=${JVMClassPath_RAW}
+	else
+		#default: fallback to OracleJavaFolder
+		JVMClassPath="${JavaFolder}/*"
 	fi
 	# expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
 	JVMClassPath=`eval "echo ${JVMClassPath}"`
@@ -235,6 +235,49 @@ else
 fi
 
 
+#
+# internationalized messages
+#
+############################################
+
+LANG=`defaults read -g AppleLocale`
+
+# French localization
+if [[ $LANG == fr* ]] ; then
+	MSG_ERROR_LAUNCHING="Erreur au lancement de '${CFBundleName}'."
+	MSG_MISSING_MAINCLASS="'MainClass' n'est pas spécifié.\nL'application Java ne peut pas être lancée."
+	MSG_NO_SUITABLE_JAVA="La version de Java installée sur votre système ne convient pas.\nCe programme nécessite Java"
+	MSG_JAVA_VERSION_OR_LATER="ou plus tard"
+	MSG_JAVA_VERSION_LATEST="(dernière mise à jour)"
+	MSG_NO_SUITABLE_JAVA_CHECK="Merci de bien vouloir installer la version de Java requise."
+	MSG_INSTALL_JAVA="Java doit être installé sur votre système.\nRendez-vous sur java.com et suivez les instructions d'installation..."
+	MSG_LATER="Plus tard"
+	MSG_VISIT_JAVA_DOT_COM="Visiter java.com"
+
+# German localization
+elif [[ $LANG == de* ]] ; then
+	MSG_ERROR_LAUNCHING="FEHLER beim starten von '${CFBundleName}'."
+	MSG_MISSING_MAINCLASS="Die 'MainClass' ist nicht spezifiziert!\nDie Java-Anwendung kann nicht gestartet werden!"
+	MSG_NO_SUITABLE_JAVA="Es wurde keine passende Java-Version auf Ihrem System gefunden!\nDieses Programm benötigt Java"
+	MSG_JAVA_VERSION_OR_LATER="oder neuer"
+	MSG_JAVA_VERSION_LATEST="(neuste Unterversion)"
+	MSG_NO_SUITABLE_JAVA_CHECK="Stellen Sie sicher, dass die angeforderte Java-Version installiert ist."
+	MSG_INSTALL_JAVA="Auf Ihrem System muss die 'Java'-Software installiert sein.\nBesuchen Sie java.com für weitere Installationshinweise."
+	MSG_LATER="Später"
+	MSG_VISIT_JAVA_DOT_COM="java.com öffnen"
+
+# English default localization
+else
+	MSG_ERROR_LAUNCHING="ERROR launching '${CFBundleName}'."
+	MSG_MISSING_MAINCLASS="'MainClass' isn't specified!\nJava application cannot be started!"
+	MSG_NO_SUITABLE_JAVA="No suitable Java version found on your system!\nThis program requires Java"
+	MSG_JAVA_VERSION_OR_LATER="or later"
+	MSG_JAVA_VERSION_LATEST="(latest update)"
+	MSG_NO_SUITABLE_JAVA_CHECK="Make sure you install the required Java version."
+	MSG_INSTALL_JAVA="You need to have JAVA installed on your Mac!\nVisit java.com for installation instructions..."
+	MSG_LATER="Later"
+	MSG_VISIT_JAVA_DOT_COM="Visit java.com"
+fi
 
 
 #
@@ -244,7 +287,7 @@ fi
 function JavaVersionSatisfiesRequirement() {
   java_ver=$1
   java_req=$2
-  
+
   # e.g. 1.8*
   if [[ ${java_req} =~ ^[0-9]\.[0-9]\*$ ]] ; then
     java_req_num=${java_req:0:3}
@@ -254,7 +297,7 @@ function JavaVersionSatisfiesRequirement() {
     else
       return 1
     fi
-  
+
   # e.g. 1.8+
   elif [[ ${java_req} =~ ^[0-9]\.[0-9]\+$ ]] ; then
     java_req_num=`echo ${java_req} | sed -E 's/[[:punct:]]//g'`
@@ -264,15 +307,15 @@ function JavaVersionSatisfiesRequirement() {
     else
       return 1
     fi
-  
+
   # e.g. 1.8
   elif [[ ${java_req} =~ ^[0-9]\.[0-9]$ ]] ; then
     if [ ${java_ver} == ${java_req} ] ; then
       return 0
     else
       return 1
     fi
-  
+
   # not matching any of the above patterns
   else
     return 2
@@ -303,7 +346,7 @@ oracle_jre_version=`extractJavaMajorVersion "${oracle_jre_plugin}"`
 # first check system variable "$JAVA_HOME"
 if [ -n "$JAVA_HOME" ] ; then
 	JAVACMD="$JAVA_HOME/bin/java"
-	
+
 # check for JVMversion requirements
 elif [ ! -z ${JVMVersion} ] ; then
 
@@ -321,11 +364,11 @@ elif [ ! -z ${JVMVersion} ] ; then
 
 	else
 		# display human readable java version (#28)
-		java_version_hr=`echo ${JVMVersion} | sed -E 's/[0-9]\.([0-9+*]+)/\1/g' | sed 's/+/ or later/' | sed 's/*/ (latest update)/'`
+		java_version_hr=`echo ${JVMVersion} | sed -E 's/[0-9]\.([0-9+*]+)/ \1/g' | sed "s/+/ ${MSG_JAVA_VERSION_OR_LATER}/" | sed "s/*/ ${MSG_JAVA_VERSION_LATEST}/"`
 		# display error message with applescript
-		osascript -e "tell application \"System Events\" to display dialog \"ERROR launching '${CFBundleName}'\n\nNo suitable Java version found on your system!\nThis program requires Java ${java_version_hr}\nMake sure you install the required Java version.\" with title \"${CFBundleName}\"  buttons {\" OK \", \"Visit java.com\"} default button \"Visit java.com\" with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)" \
+		osascript -e "tell application \"System Events\" to display dialog \"${MSG_ERROR_LAUNCHING}\n\n${MSG_NO_SUITABLE_JAVA}${java_version_hr}.\n${MSG_NO_SUITABLE_JAVA_CHECK}\" with title \"${CFBundleName}\"  buttons {\" OK \", \"${MSG_VISIT_JAVA_DOT_COM}\"} default button \"${MSG_VISIT_JAVA_DOT_COM}\" with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)" \
 				-e "set response to button returned of the result" \
-				-e "if response is \"Visit java.com\" then open location \"http://java.com\""
+				-e "if response is \"${MSG_VISIT_JAVA_DOT_COM}\" then open location \"http://java.com\""
     # exit with error
 		exit 3
 	fi
@@ -356,7 +399,7 @@ fi
 # display error message if MainClassName is empty
 if [ -z ${JVMMainClass} ]; then
 	# display error message with applescript
-	osascript -e "tell application \"System Events\" to display dialog \"ERROR launching '${CFBundleName}'!\n\n'MainClass' isn't specified!\nJava application cannot be started!\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1 with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"
+	osascript -e "tell application \"System Events\" to display dialog \"${MSG_ERROR_LAUNCHING}\n\n${MSG_MISSING_MAINCLASS}\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1 with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"
 	# exit with error
 	exit 2
 
@@ -392,9 +435,9 @@ elif [ -f "$JAVACMD" ] && [ -x "$JAVACMD" ] ; then
 else
 
 	# display error message with applescript
-	osascript -e "tell application \"System Events\" to display dialog \"ERROR launching '${CFBundleName}'!\n\nYou need to have JAVA installed on your Mac!\nVisit java.com for installation instructions...\" with title \"${CFBundleName}\" buttons {\"Later\", \"Visit java.com\"} default button \"Visit java.com\" with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)" \
+	osascript -e "tell application \"System Events\" to display dialog \"${MSG_ERROR_LAUNCHING}\n\n${MSG_INSTALL_JAVA}\" with title \"${CFBundleName}\" buttons {\"${MSG_LATER}\", \"${MSG_VISIT_JAVA_DOT_COM}\"} default button \"${MSG_VISIT_JAVA_DOT_COM}\" with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)" \
 				-e "set response to button returned of the result" \
-				-e "if response is \"Visit java.com\" then open location \"http://java.com\""
+				-e "if response is \"${MSG_VISIT_JAVA_DOT_COM}\" then open location \"http://java.com\""
 
 	# exit with error
 	exit 1