prep for internationalization?

eyedeekay · Dec 6, 2018 · 08e0898 · 08e0898
1 parent 10c0932
commit 08e0898
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -73,7 +73,6 @@ recopy-windows:
 
 windows: recopy-windows
 	makensis i2pbrowser-installer.nsi
-	mv install-i2pbrowser-0.01.exe install-i2pbrowser-$(VERSION).exe
 	cp install-i2pbrowser-$(VERSION).exe install-i2pbrowser.exe
 
 wxs-windows: wix

diff --git a/README.md.asc b/README.md.asc
@@ -224,12 +224,12 @@ Browser Security Testing:
 
 -----BEGIN PGP SIGNATURE-----
 
-iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlwIgMAACgkQ11wDs5te
-FOHttQf+PhX/QFqUai26nKaVMmrwmnn9B2GcEoBRUfCNHb1Ft8LD/LCpdjv7biu5
-kd1TJ12z+50sQQlDCQ79gx+IKhxw2mv7oYU5XzCbHao6dt6Q/oki4GmVt3kbhPbN
-GkU3ozJll3p+G3NYkskpr3vVP8AMQHzydhU5tQOhmmzzKYjj0BoZsP5AySas0P7O
-5JWWe8H06ocjlphJUVhVPBwZS8rLXs6N0YNaql6/Dvmd52qJUzyrZamTiCbQwudV
-pVmtbSoDnYZHOZmBQrbOOv7DGsd7L296HafufJpog2nJQsFfNDS6bIaKMt/YTqMp
-lm9dzm7rND0iuezbVc84iSWx55kWGQ==
-=+POo
+iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlwI34cACgkQ11wDs5te
+FOEYcQf9FzCfuCY6TLvGplcxFLsDnwQB28DXiWlhwEhkXOp08L7IrHPp6mlw9wIw
+lmYVb5yJbJ/CeFhGgIXK/+0hVgRAftG+yh3gKKOIlOdSVuerDvonQsbdIsKGiUOT
+mgCTYFVEMhqQEPH8oxVL5Ldgi77+1zN6vY+/Q3khhlU1Xjiizmt6/wsYux9h7oHk
+sVHqPBFi1PpaodH4U2wHdYEYjh3RYsgsuXCZStrEy/WA2dAReonDnwn5xA21jCNi
+Uus1tQVXfC8vhTACzsaeqRusnVqdzicV+o6YxUE5kUx6IZiHcZM3N5pehc4GubOA
+qtP4OkIZ4HbiOm8owF/wIgeZnvQ80A==
+=/SHi
 -----END PGP SIGNATURE-----
diff --git a/i2pbrowser-installer.nsi b/i2pbrowser-installer.nsi
@@ -1,10 +1,8 @@
-!define APPNAME "I2PBrowser-Launcher"
-!define COMPANYNAME "I2P"
-!define DESCRIPTION "This launches Firefox with a browser profile pre-configured to use i2p"
+!include nsis_strings/i2pbrowser-en_US.nsi
 # These three must be integers
 !define VERSIONMAJOR 0
-!define VERSIONMINOR 0
-!define VERSIONBUILD 1
+!define VERSIONMINOR 3
+!define VERSIONBUILD a
 var FFINSTEXE
 var I2PINSTEXE
 var SHORTCUT
@@ -45,17 +43,17 @@ RequestExecutionLevel admin
 !include i2pbrowser-strrep.nsh
 
 PageEx license
-    licensetext "MIT License"
+    licensetext "${LICENSE_TITLE}"
     licensedata "LICENSE.txt"
 PageExEnd
 PageEx directory
-    dirtext "Select the location of your Firefox installation."
+    dirtext "${FIREFOX_MESSAGE}"
     dirvar $FFINSTEXE
     PageCallbacks firefoxDetect
 PageExEnd
 Page instfiles
 PageEx directory
-    dirtext "Select the location of your i2p installation."
+    dirtext "${I2P_MESSAGE}"
     dirvar $I2PINSTEXE
     PageCallbacks routerDetect
 PageExEnd
@@ -72,13 +70,19 @@ Function .onInit
         ${If} ${FileExists} "$PROFILE/OneDrive/Desktop/Tor Browser/Browser/firefox.exe"
             StrCpy $FFINSTEXE "$PROFILE/OneDrive/Desktop/Tor Browser/Browser/"
         ${EndIf}
+        ${If} ${FileExists} "$PROFILE/Desktop/Tor Browser/Browser/firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE/Desktop/Tor Browser/Browser/"
+        ${EndIf}
     ${Else}
         ${If} ${FileExists} "${FFINSTEXE32}/firefox.exe"
             StrCpy $FFINSTEXE "${FFINSTEXE32}"
         ${EndIf}
         ${If} ${FileExists} "$PROFILE/OneDrive/Desktop/Tor Browser/Browser/firefox.exe"
             StrCpy $FFINSTEXE "$PROFILE/OneDrive/Desktop/Tor Browser/Browser/"
         ${EndIf}
+        ${If} ${FileExists} "$PROFILE/Desktop/Tor Browser/Browser/firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE/Desktop/Tor Browser/Browser/"
+        ${EndIf}
     ${EndIf}
     ${If} ${FileExists} "${I2PINSTEXE32}/i2p.exe"
         StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
@@ -90,13 +94,13 @@ FunctionEnd
 
 Function firefoxDetect
     ${If} ${FileExists} "$FFINSTEXE/firefox.exe"
-        Abort
+        Abort directory
     ${EndIf}
 FunctionEnd
 
 Function routerDetect
     ${If} ${FileExists} "$I2PINSTEXE/i2p.exe"
-        Abort
+        Abort directory
     ${EndIf}
 FunctionEnd
 
@@ -233,7 +237,7 @@ SectionEnd
 
 !include "MUI2.nsh"
 !define MUI_FINISHPAGE_RUN
-!define MUI_FINISHPAGE_RUN_TEXT "Launch the i2p browser?"
+!define MUI_FINISHPAGE_RUN_TEXT "${LAUNCH_TEXT}"
 !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
 !insertmacro MUI_PAGE_FINISH
 

diff --git a/nsis_strings/i2pbrowser-en_US.nsi b/nsis_strings/i2pbrowser-en_US.nsi
@@ -0,0 +1,7 @@
+!define APPNAME "I2PBrowser-Launcher"
+!define COMPANYNAME "I2P"
+!define DESCRIPTION "This launches Firefox with a browser profile pre-configured to use i2p"
+!define FIREFOX_MESSAGE "Select the location of your Firefox installation."
+!define I2P_MESSAGE "Select the location of your i2p installation."
+!define LAUNCH_TEXT "Launch the i2p browser?"
+!define LICENSE_TITLE "MIT License"