Merge branch 'translations-support'

Fixes #18.
vslavik · Jun 3, 2015 · b078b72 · b078b72
2 parents 40870af + 98aa942
commit b078b72
Show file tree

Hide file tree

Showing 57 changed files with 3,702 additions and 12 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
 *.sln       text eol=crlf
 *.vcxproj*  text eol=crlf
 *.vcproj    text eol=crlf
+.nuget/packages.config text eol=crlf
diff --git a/.gitignore b/.gitignore
@@ -8,8 +8,10 @@
 *.vcproj.*.user
 *.vcxproj.user
 ipch
+translations/*.mo
 3rdparty/wxWidgets/build/bakefiles/.bakefile_gen.state
 3rdparty/wxWidgets/lib/vc_lib
 3rdparty/wxWidgets/build/msw/*_*/
 3rdparty/expat/win32/bin
 3rdparty/expat/win32/tmp
+packages
diff --git a/.nuget/packages.config b/.nuget/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Gettext.Tools" version="0.19.4" />
+</packages>
diff --git a/3rdparty/wx-2010.vcxproj b/3rdparty/wx-2010.vcxproj
@@ -177,7 +177,9 @@
     <ClCompile Include="wxWidgets\src\common\file.cpp" />
     <ClCompile Include="wxWidgets\src\common\filefn.cpp" />
     <ClCompile Include="wxWidgets\src\common\filename.cpp" />
+    <ClCompile Include="wxWidgets\src\common\fmapbase.cpp" />
     <ClCompile Include="wxWidgets\src\common\fontcmn.cpp" />
+    <ClCompile Include="wxWidgets\src\common\fontmap.cpp" />
     <ClCompile Include="wxWidgets\src\common\framecmn.cpp" />
     <ClCompile Include="wxWidgets\src\common\gaugecmn.cpp" />
     <ClCompile Include="wxWidgets\src\common\gbsizer.cpp" />
@@ -187,7 +189,9 @@
     <ClCompile Include="wxWidgets\src\common\iconbndl.cpp" />
     <ClCompile Include="wxWidgets\src\common\image.cpp" />
     <ClCompile Include="wxWidgets\src\common\init.cpp" />
+    <ClCompile Include="wxWidgets\src\common\intl.cpp" />
     <ClCompile Include="wxWidgets\src\common\ipcbase.cpp" />
+    <ClCompile Include="wxWidgets\src\common\languageinfo.cpp" />
     <ClCompile Include="wxWidgets\src\common\layout.cpp" />
     <ClCompile Include="wxWidgets\src\common\list.cpp" />
     <ClCompile Include="wxWidgets\src\common\longlong.cpp" />
@@ -226,6 +230,7 @@
     <ClCompile Include="wxWidgets\src\common\timerimpl.cpp" />
     <ClCompile Include="wxWidgets\src\common\tokenzr.cpp" />
     <ClCompile Include="wxWidgets\src\common\toplvcmn.cpp" />
+    <ClCompile Include="wxWidgets\src\common\translation.cpp" />
     <ClCompile Include="wxWidgets\src\common\unichar.cpp" />
     <ClCompile Include="wxWidgets\src\common\uri.cpp" />
     <ClCompile Include="wxWidgets\src\common\ustring.cpp" />

diff --git a/3rdparty/wx-2010.vcxproj.filters b/3rdparty/wx-2010.vcxproj.filters
@@ -118,9 +118,15 @@
     <ClCompile Include="wxWidgets\src\common\filename.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\fmapbase.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\fontcmn.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\fontmap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\framecmn.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -148,9 +154,15 @@
     <ClCompile Include="wxWidgets\src\common\init.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\intl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\ipcbase.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\languageinfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\layout.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -265,6 +277,9 @@
     <ClCompile Include="wxWidgets\src\common\toplvcmn.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\translation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\unichar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/3rdparty/wx-2012.vcxproj b/3rdparty/wx-2012.vcxproj
@@ -183,7 +183,9 @@
     <ClCompile Include="wxWidgets\src\common\file.cpp" />
     <ClCompile Include="wxWidgets\src\common\filefn.cpp" />
     <ClCompile Include="wxWidgets\src\common\filename.cpp" />
+    <ClCompile Include="wxWidgets\src\common\fmapbase.cpp" />
     <ClCompile Include="wxWidgets\src\common\fontcmn.cpp" />
+    <ClCompile Include="wxWidgets\src\common\fontmap.cpp" />
     <ClCompile Include="wxWidgets\src\common\framecmn.cpp" />
     <ClCompile Include="wxWidgets\src\common\gaugecmn.cpp" />
     <ClCompile Include="wxWidgets\src\common\gbsizer.cpp" />
@@ -193,7 +195,9 @@
     <ClCompile Include="wxWidgets\src\common\iconbndl.cpp" />
     <ClCompile Include="wxWidgets\src\common\image.cpp" />
     <ClCompile Include="wxWidgets\src\common\init.cpp" />
+    <ClCompile Include="wxWidgets\src\common\intl.cpp" />
     <ClCompile Include="wxWidgets\src\common\ipcbase.cpp" />
+    <ClCompile Include="wxWidgets\src\common\languageinfo.cpp" />
     <ClCompile Include="wxWidgets\src\common\layout.cpp" />
     <ClCompile Include="wxWidgets\src\common\list.cpp" />
     <ClCompile Include="wxWidgets\src\common\longlong.cpp" />
@@ -232,6 +236,7 @@
     <ClCompile Include="wxWidgets\src\common\timerimpl.cpp" />
     <ClCompile Include="wxWidgets\src\common\tokenzr.cpp" />
     <ClCompile Include="wxWidgets\src\common\toplvcmn.cpp" />
+    <ClCompile Include="wxWidgets\src\common\translation.cpp" />
     <ClCompile Include="wxWidgets\src\common\unichar.cpp" />
     <ClCompile Include="wxWidgets\src\common\uri.cpp" />
     <ClCompile Include="wxWidgets\src\common\ustring.cpp" />

diff --git a/3rdparty/wx-2012.vcxproj.filters b/3rdparty/wx-2012.vcxproj.filters
@@ -118,9 +118,15 @@
     <ClCompile Include="wxWidgets\src\common\filename.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\fmapbase.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\fontcmn.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\fontmap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\framecmn.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -148,9 +154,15 @@
     <ClCompile Include="wxWidgets\src\common\init.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\intl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\ipcbase.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\languageinfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\layout.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -265,6 +277,9 @@
     <ClCompile Include="wxWidgets\src\common\toplvcmn.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\translation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\unichar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/3rdparty/wx-2013.vcxproj b/3rdparty/wx-2013.vcxproj
@@ -183,7 +183,9 @@
     <ClCompile Include="wxWidgets\src\common\file.cpp" />
     <ClCompile Include="wxWidgets\src\common\filefn.cpp" />
     <ClCompile Include="wxWidgets\src\common\filename.cpp" />
+    <ClCompile Include="wxWidgets\src\common\fmapbase.cpp" />
     <ClCompile Include="wxWidgets\src\common\fontcmn.cpp" />
+    <ClCompile Include="wxWidgets\src\common\fontmap.cpp" />
     <ClCompile Include="wxWidgets\src\common\framecmn.cpp" />
     <ClCompile Include="wxWidgets\src\common\gaugecmn.cpp" />
     <ClCompile Include="wxWidgets\src\common\gbsizer.cpp" />
@@ -193,7 +195,9 @@
     <ClCompile Include="wxWidgets\src\common\iconbndl.cpp" />
     <ClCompile Include="wxWidgets\src\common\image.cpp" />
     <ClCompile Include="wxWidgets\src\common\init.cpp" />
+    <ClCompile Include="wxWidgets\src\common\intl.cpp" />
     <ClCompile Include="wxWidgets\src\common\ipcbase.cpp" />
+    <ClCompile Include="wxWidgets\src\common\languageinfo.cpp" />
     <ClCompile Include="wxWidgets\src\common\layout.cpp" />
     <ClCompile Include="wxWidgets\src\common\list.cpp" />
     <ClCompile Include="wxWidgets\src\common\longlong.cpp" />
@@ -232,6 +236,7 @@
     <ClCompile Include="wxWidgets\src\common\timerimpl.cpp" />
     <ClCompile Include="wxWidgets\src\common\tokenzr.cpp" />
     <ClCompile Include="wxWidgets\src\common\toplvcmn.cpp" />
+    <ClCompile Include="wxWidgets\src\common\translation.cpp" />
     <ClCompile Include="wxWidgets\src\common\unichar.cpp" />
     <ClCompile Include="wxWidgets\src\common\uri.cpp" />
     <ClCompile Include="wxWidgets\src\common\ustring.cpp" />

diff --git a/3rdparty/wx-2013.vcxproj.filters b/3rdparty/wx-2013.vcxproj.filters
@@ -118,9 +118,15 @@
     <ClCompile Include="wxWidgets\src\common\filename.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\fmapbase.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\fontcmn.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\fontmap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\framecmn.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -148,9 +154,15 @@
     <ClCompile Include="wxWidgets\src\common\init.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\intl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\ipcbase.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\languageinfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\layout.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -265,6 +277,9 @@
     <ClCompile Include="wxWidgets\src\common\toplvcmn.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wxWidgets\src\common\translation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="wxWidgets\src\common\unichar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/3rdparty/wx.vcproj b/3rdparty/wx.vcproj
@@ -435,10 +435,18 @@
 				RelativePath="wxWidgets\src\common\filename.cpp"
 				>
 			</File>
+			<File
+				RelativePath="wxWidgets\src\common\fmapbase.cpp"
+				>
+			</File>
 			<File
 				RelativePath="wxWidgets\src\common\fontcmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="wxWidgets\src\common\fontmap.cpp"
+				>
+			</File>
 			<File
 				RelativePath="wxWidgets\src\common\framecmn.cpp"
 				>
@@ -475,10 +483,18 @@
 				RelativePath="wxWidgets\src\common\init.cpp"
 				>
 			</File>
+			<File
+				RelativePath="wxWidgets\src\common\intl.cpp"
+				>
+			</File>
 			<File
 				RelativePath="wxWidgets\src\common\ipcbase.cpp"
 				>
 			</File>
+			<File
+				RelativePath="wxWidgets\src\common\languageinfo.cpp"
+				>
+			</File>
 			<File
 				RelativePath="wxWidgets\src\common\layout.cpp"
 				>
@@ -631,6 +647,10 @@
 				RelativePath="wxWidgets\src\common\toplvcmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="wxWidgets\src\common\translation.cpp"
+				>
+			</File>
 			<File
 				RelativePath="wxWidgets\src\common\unichar.cpp"
 				>

diff --git a/3rdparty/wxWidgets.bkl b/3rdparty/wxWidgets.bkl
@@ -52,7 +52,9 @@ library WinSparkle_wx {
         src/common/file.cpp
         src/common/filefn.cpp
         src/common/filename.cpp
+        src/common/fmapbase.cpp
         src/common/fontcmn.cpp
+        src/common/fontmap.cpp
         src/common/framecmn.cpp
         src/common/gaugecmn.cpp
         src/common/gbsizer.cpp
@@ -62,7 +64,9 @@ library WinSparkle_wx {
         src/common/iconbndl.cpp
         src/common/image.cpp
         src/common/init.cpp
+        src/common/intl.cpp
         src/common/ipcbase.cpp
+        src/common/languageinfo.cpp
         src/common/layout.cpp
         src/common/list.cpp
         src/common/longlong.cpp
@@ -101,6 +105,7 @@ library WinSparkle_wx {
         src/common/timerimpl.cpp
         src/common/tokenzr.cpp
         src/common/toplvcmn.cpp
+        src/common/translation.cpp
         src/common/unichar.cpp
         src/common/uri.cpp
         src/common/ustring.cpp

diff --git a/3rdparty/wxWidgets_setup_h/wx/setup.h b/3rdparty/wxWidgets_setup_h/wx/setup.h
@@ -454,7 +454,7 @@
 #define wxUSE_TEXTFILE      0
 
 // i18n support: _() macro, wxLocale class. Requires wxTextFile.
-#define wxUSE_INTL          0
+#define wxUSE_INTL          1
 
 // Provide wxFoo_l() functions similar to standard foo() functions but taking
 // an extra locale parameter.
@@ -609,7 +609,7 @@
 #define wxUSE_FONTENUM 0
 
 // wxFontMapper class
-#define wxUSE_FONTMAP 0
+#define wxUSE_FONTMAP 1
 
 // wxMimeTypesManager class
 #define wxUSE_MIMETYPE 0

diff --git a/WinSparkle-2010.vcxproj b/WinSparkle-2010.vcxproj
@@ -201,6 +201,7 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\winsparkle.rc" />
+    <ResourceCompile Include="translations\translations.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="3rdparty\expat-2010.vcxproj">

diff --git a/WinSparkle-2010.vcxproj.filters b/WinSparkle-2010.vcxproj.filters
@@ -93,5 +93,8 @@
     <ResourceCompile Include="src\winsparkle.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
+    <ResourceCompile Include="translations\translations.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>
diff --git a/WinSparkle-2012.vcxproj b/WinSparkle-2012.vcxproj
@@ -207,6 +207,7 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\winsparkle.rc" />
+    <ResourceCompile Include="translations\translations.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="3rdparty\expat-2012.vcxproj">

diff --git a/WinSparkle-2012.vcxproj.filters b/WinSparkle-2012.vcxproj.filters
@@ -93,5 +93,8 @@
     <ResourceCompile Include="src\winsparkle.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
+    <ResourceCompile Include="translations\translations.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>
diff --git a/WinSparkle-2013.sln b/WinSparkle-2013.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinSparkle", "WinSparkle-2013.vcxproj", "{524CCCF2-61EA-5B64-A1D9-FF5497027B5F}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -20,6 +20,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_psdk", "examples\ex
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{2C4E4846-FF11-55AD-AFD1-BC1F3AF74724}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{5D678636-E84E-405E-9899-F2AB26A9D005}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\packages.config = .nuget\packages.config
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32