[ros-diffs] 01/04: [ZIPFLDR] Support for multiple languages interface

[Bișoc George]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84cc11d4c34e2546d9734…

commit 84cc11d4c34e2546d9734aaf0795a9975f0b6652
Author:     Bișoc George <fraizeraust99(a)gmail.com>
AuthorDate: Sun Apr 8 17:15:24 2018 +0200
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sat Apr 14 19:29:35 2018 +0200

    [ZIPFLDR] Support for multiple languages interface
---
 dll/shellext/zipfldr/{zipfldr.rc => lang/en-US.rc} | 33 +++-------
 dll/shellext/zipfldr/zipfldr.rc                    | 75 ++--------------------
 2 files changed, 13 insertions(+), 95 deletions(-)

diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/lang/en-US.rc
similarity index 83%
copy from dll/shellext/zipfldr/zipfldr.rc
copy to dll/shellext/zipfldr/lang/en-US.rc
index b9f93eecf7..ce2b78e1c7 100644
--- a/dll/shellext/zipfldr/zipfldr.rc
+++ b/dll/shellext/zipfldr/lang/en-US.rc
@@ -1,25 +1,13 @@
-#include <windef.h>
-#include <winuser.h>
+/*
+ * PROJECT:     ReactOS Zip Shell Extension
+ * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE:     English (United States) resource translation
+ * COPYRIGHT:   Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org)
+ */
 
-#include "resource.h"
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-1 ICON "res/zipfldr.ico"
-
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Zip Shell Extension"
-#define REACTOS_STR_INTERNAL_NAME     "zipfldr"
-#define REACTOS_STR_ORIGINAL_FILENAME "zipfldr.dll"
-#include <reactos/version.rc>
-
-#include <reactos/manifest_dll.rc>
-
-IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs"
-
-
-
-IDD_PROPPAGEDESTIONATION DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Select a Destination"
 FONT 8, "MS Shell Dlg", 400, 0, 0x0
@@ -32,7 +20,6 @@ BEGIN
     CONTROL        
"",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6
 END
 
-
 IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Extraction Complete"
@@ -44,7 +31,6 @@ BEGIN
     LTEXT           "Press finish to continue.",IDC_STATIC,6,84,174,8
 END
 
-
 IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56
 STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Confirm File Replace"
@@ -58,8 +44,6 @@ BEGIN
     LTEXT           "",IDC_MESSAGE,36,6,228,24
 END
 
-
-
 STRINGTABLE
 BEGIN
     IDS_COL_NAME "Name"
@@ -84,5 +68,4 @@ BEGIN
     IDS_MENUITEM "Extract &All..."
     IDS_HELPTEXT "Extracts folder contents"
     IDS_FRIENDLYNAME "Compressed (zipped) Folder"
-
 END
diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc
index b9f93eecf7..24fde95967 100644
--- a/dll/shellext/zipfldr/zipfldr.rc
+++ b/dll/shellext/zipfldr/zipfldr.rc
@@ -3,8 +3,6 @@
 
 #include "resource.h"
 
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
 1 ICON "res/zipfldr.ico"
 
 #define REACTOS_VERSION_DLL
@@ -17,72 +15,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs"
 
+/* UTF-8 */
+#pragma code_page(65001)
 
-
-IDD_PROPPAGEDESTIONATION DIALOGEX 0, 0, 235, 156
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Select a Destination"
-FONT 8, "MS Shell Dlg", 400, 0, 0x0
-BEGIN
-    LTEXT           "Select the destination directory",IDC_STATIC,6,12,174,8
-    EDITTEXT        IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_BROWSE,174,42,54,14
-    PUSHBUTTON      "Password",IDC_PASSWORD,174,66,54,14
-    LTEXT           "Extracting...",IDC_STATIC,6,114,42,8
-    CONTROL        
"",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6
-END
-
-
-IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Extraction Complete"
-FONT 8, "MS Shell Dlg", 400, 0, 0x0
-BEGIN
-    LTEXT           "The files have been extracted to the following
directory:",IDC_STATIC,6,12,222,18
-    LTEXT           "Target dir",IDC_DESTDIR,6,36,222,8
-    CONTROL         "Show extracted
files",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10
-    LTEXT           "Press finish to continue.",IDC_STATIC,6,84,174,8
-END
-
-
-IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56
-STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Confirm File Replace"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "&Yes",IDYES,6,36,62,14
-    PUSHBUTTON      "Cancel",IDCANCEL,204,36,62,14
-    PUSHBUTTON      "Yes &To All",IDYESALL,72,36,62,14
-    PUSHBUTTON      "&No",IDNO,138,36,62,14
-    ICON            "",IDC_EXCLAMATION_ICON,6,6,24,22
-    LTEXT           "",IDC_MESSAGE,36,6,228,24
-END
-
-
-
-STRINGTABLE
-BEGIN
-    IDS_COL_NAME "Name"
-    IDS_COL_TYPE "Type"
-    IDS_COL_COMPRSIZE "Compressed size"
-    IDS_COL_PASSWORD "Password"
-    IDS_COL_SIZE "Size"
-    IDS_COL_RATIO "Ratio"
-    IDS_COL_DATE_MOD "Date modified"
-    IDS_YES "Yes"
-    IDS_NO "No"
-
-    IDS_WIZ_TITLE "Extraction Wizard"
-    IDS_WIZ_DEST_TITLE "Select a Destination"
-    IDS_WIZ_DEST_SUBTITLE "The files from the zip archive will be extracted to the
location specified."
-    IDS_WIZ_COMPL_TITLE "Extraction Complete"
-    IDS_WIZ_COMPL_SUBTITLE "The files from the zip archive have been
extracted."
-    IDS_WIZ_BROWSE_TITLE "Select the place where you want to extract the selected
items."
-
-    IDS_OVERWRITEFILE_TEXT "This folder already contains a file called
'%1'.\nDo you want to replace it?"
-
-    IDS_MENUITEM "Extract &All..."
-    IDS_HELPTEXT "Extracts folder contents"
-    IDS_FRIENDLYNAME "Compressed (zipped) Folder"
-
-END
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
+#endif