nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[appstore] fix invalid country code for Serbia

Browse source 
* sr-SR is not a country code that Microsoft accepts (and from what I can see
  is not valid, because it should be sr-RS).
* This has the unfortunate effect of preventing the installation of Rufus from
  the Windows Store, which fails with error 0x80070057 (Invalid parameter).
* Fix this by using a country code for Serbia that Microsoft does accept: sr-Latn-RS
* Closes #2015
This commit is contained in:
Pete Batard 2022-08-12 11:09:04 +01:00
parent 55ce65af6c
commit ae839d96ef
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/appstore/RufusAppxManifest.xml
View file

@ -57,7 +57,7 @@
<Resource Language="pt-PT"/> <Resource Language="pt-PT"/>
<Resource Language="ro-RO"/> <Resource Language="ro-RO"/>
<Resource Language="ru-RU"/> <Resource Language="ru-RU"/>
<Resource Language="sr-SP"/> <Resource Language="sr-Latn-RS"/>
<Resource Language="sk-SK"/> <Resource Language="sk-SK"/>
<Resource Language="sl-SI"/> <Resource Language="sl-SI"/>
<Resource Language="es-ES"/> <Resource Language="es-ES"/>

4
res/appstore/packme.cmd
View file

@ -31,8 +31,10 @@ set DEFAULT_SCALE=200
set OTHER_SCALES=100 125 150 400 set OTHER_SCALES=100 125 150 400
set SCALED_IMAGES=LargeTile SmallTile Square44x44Logo Square150x150Logo StoreLogo Wide310x150Logo set SCALED_IMAGES=LargeTile SmallTile Square44x44Logo Square150x150Logo StoreLogo Wide310x150Logo
rem All the languages listed below *MUST* match the ones from the Resources section of AppManifest.xml rem All the languages listed below *MUST* match the ones from the Resources section of AppManifest.xml
rem Oh, and these must be *valid* codes that Microsoft accepts, else your users will get an error
rem (that the Microsoft validation and certification process will *NOT* catch) during install.
set DEFAULT_LANGUAGE=en-US set DEFAULT_LANGUAGE=en-US
set ADDITIONAL_LANGUAGES=ar-SA bg-BG zh-CN zh-TW hr-HR cs-CZ da-DK nl-NL fi-FI fr-FR de-DE el-GR he-IL hu-HU id-ID it-IT ja-JP ko-KR lv-LV lt-LT ms-MY nb-NO fa-IR pl-PL pt-BR pt-PT ro-RO ru-RU sr-SP sk-SK sl-SI es-ES sv-SE th-TH tr-TR uk-UA vi-VN set ADDITIONAL_LANGUAGES=ar-SA bg-BG zh-CN zh-TW hr-HR cs-CZ da-DK nl-NL fi-FI fr-FR de-DE el-GR he-IL hu-HU id-ID it-IT ja-JP ko-KR lv-LV lt-LT ms-MY nb-NO fa-IR pl-PL pt-BR pt-PT ro-RO ru-RU sr-Latn-RS sk-SK sl-SI es-ES sv-SE th-TH tr-TR uk-UA vi-VN
set PACKAGE_IMAGES=^ set PACKAGE_IMAGES=^
Square44x44Logo.altform-lightunplated_targetsize-16.png^ Square44x44Logo.altform-lightunplated_targetsize-16.png^
Square44x44Logo.altform-lightunplated_targetsize-24.png^ Square44x44Logo.altform-lightunplated_targetsize-24.png^

4
res/loc/rufus.loc
View file

@ -32,7 +32,7 @@
# • v3.14 "pt-PT" "Portuguese Standard (Português)" # • v3.14 "pt-PT" "Portuguese Standard (Português)"
# • v3.14 "ro-RO" "Romanian (Română)" # • v3.14 "ro-RO" "Romanian (Română)"
# • v3.5 "ru-RU" "Russian (Русский)" # • v3.5 "ru-RU" "Russian (Русский)"
# • v3.14 "sr-SP" "Serbian (Srpski)" # • v3.14 "sr-RS" "Serbian (Srpski)"
# • v3.14 "sk-SK" "Slovak (Slovensky)" # • v3.14 "sk-SK" "Slovak (Slovensky)"
# • v3.14 "sl-SI" "Slovenian (Slovenščina)" # • v3.14 "sl-SI" "Slovenian (Slovenščina)"
# • v3.14 "es-ES" "Spanish (Español)" # • v3.14 "es-ES" "Spanish (Español)"
@ -11001,7 +11001,7 @@ t MSG_306 "Быстрое обнуление диска: %s"
t MSG_307 "Это может занять время" t MSG_307 "Это может занять время"
######################################################################### #########################################################################
l "sr-SP" "Serbian (Srpski)" 0x241a, 0x081a, 0x181a, 0x2c1a, 0x701a, 0x7c1a l "sr-RS" "Serbian (Srpski)" 0x241a, 0x081a, 0x181a, 0x2c1a, 0x701a, 0x7c1a
v 3.14 v 3.14
b "en-US" b "en-US"

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.20.1930" CAPTION "Rufus 3.20.1931"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -395,8 +395,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,20,1930,0 FILEVERSION 3,20,1931,0
PRODUCTVERSION 3,20,1930,0 PRODUCTVERSION 3,20,1931,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie" VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.20.1930" VALUE "FileVersion", "3.20.1931"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.20.exe" VALUE "OriginalFilename", "rufus-3.20.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.20.1930" VALUE "ProductVersion", "3.20.1931"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"