Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929
Modified Files:
Tag: b0_22_2
installer-SecPOPFile-body.nsh installer.nsi
Log Message:
Provide support for an optional Japanese translation of the release
notes. If this translation is not found the English version is used.
Index: installer-SecPOPFile-body.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v
retrieving revision 1.3.2.17
retrieving revision 1.3.2.18
diff -C2 -d -r1.3.2.17 -r1.3.2.18
*** installer-SecPOPFile-body.nsh 5 Dec 2007 12:38:50 -0000 1.3.2.17
--- installer-SecPOPFile-body.nsh 11 Dec 2007 12:40:53 -0000 1.3.2.18
***************
*** 184,188 ****
--- 184,200 ----
File "..\engine\license"
+
+ ; Some releases may have a Japanese translation of the release notes.
+
+ Delete "$G_ROOTDIR\${C_README}"
+
+ StrCmp $LANGUAGE ${LANG_JAPANESE} 0 English_release_notes
+ File /nonfatal "/oname=$G_ROOTDIR\${C_README}" "${C_JAPANESE_RELEASE_NOTES}"
+ IfFileExists "$G_ROOTDIR\${C_README}" copy_txt_version
+
+ English_release_notes:
File "${C_RELEASE_NOTES}"
+
+ copy_txt_version:
CopyFiles /SILENT /FILESONLY "$PLUGINSDIR\${C_README}.txt" "$G_ROOTDIR\${C_README}.txt"
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.242.4.21
retrieving revision 1.242.4.22
diff -C2 -d -r1.242.4.21 -r1.242.4.22
*** installer.nsi 4 Dec 2007 20:54:45 -0000 1.242.4.21
--- installer.nsi 11 Dec 2007 12:40:53 -0000 1.242.4.22
***************
*** 255,258 ****
--- 255,262 ----
!define C_RELEASE_NOTES "..\engine\${C_README}"
+ ; Some releases may include a Japanese translation of the release notes
+
+ !define C_JAPANESE_RELEASE_NOTES "${C_RELEASE_NOTES}.nihongo"
+
;--------------------------------------------------------------------------
; Windows Vista expects to find a manifest specifying the execution level
***************
*** 897,900 ****
--- 901,905 ----
ReserveFile "ioUM.ini"
ReserveFile "${C_RELEASE_NOTES}"
+ ReserveFile /nonfatal "${C_JAPANESE_RELEASE_NOTES}"
ReserveFile "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.pcf"
; ReserveFile "SSL_pm.pat" ; 0.22.5 does not need any SSL patches so there's no need for a built-in copy
***************
*** 1001,1006 ****
--- 1006,1024 ----
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioG.ini"
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioP.ini"
+
+ ; The 1.0.0 release introduced some significant improvements to the support for
+ ; the Japanese language so a Japanese version of the release notes was provided
+ ; for that release. If future releases do not have a Japanese translation of these
+ ; notes then the normal English version will be used.
+
+ StrCmp $LANGUAGE ${LANG_JAPANESE} 0 English_release_notes
+ File /nonfatal "/oname=$PLUGINSDIR\${C_README}" "${C_JAPANESE_RELEASE_NOTES}"
+ IfFileExists "$PLUGINSDIR\${C_README}" make_txt_file
+
+ English_release_notes:
File "/oname=$PLUGINSDIR\${C_README}" "${C_RELEASE_NOTES}"
+ make_txt_file:
+
; Ensure the release notes are in a format which the standard Windows NOTEPAD.EXE can use.
; When the "POPFile" section is processed, the converted release notes will be copied to the
|
