cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not translate Windows names.

Browse Source
This commit is contained in:
Catalin 2016-02-21 12:09:24 +02:00
parent 8aafec1ace
commit f5b78dc76f
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/msw/utils.cpp
View File

@ -1085,13 +1085,13 @@ wxString wxGetOsDescription()
// type to resolve this ambiguity // type to resolve this ambiguity
if ( wxIsWindowsServer() == 1 ) if ( wxIsWindowsServer() == 1 )
{ {
str = _("Windows Server 2003"); str = "Windows Server 2003";
break; break;
} }
//else: must be XP, fall through //else: must be XP, fall through
case 1: case 1:
str = _("Windows XP"); str = "Windows XP";
break; break;
} }
break; break;
@ -1101,40 +1101,40 @@ wxString wxGetOsDescription()
{ {
case 0: case 0:
str = wxIsWindowsServer() == 1 str = wxIsWindowsServer() == 1
? _("Windows Server 2008") ? "Windows Server 2008"
: _("Windows Vista"); : "Windows Vista";
break; break;
case 1: case 1:
str = wxIsWindowsServer() == 1 str = wxIsWindowsServer() == 1
? _("Windows Server 2008 R2") ? "Windows Server 2008 R2"
: _("Windows 7"); : "Windows 7";
break; break;
case 2: case 2:
str = wxIsWindowsServer() == 1 str = wxIsWindowsServer() == 1
? _("Windows Server 2012") ? "Windows Server 2012"
: _("Windows 8"); : "Windows 8";
break; break;
case 3: case 3:
str = wxIsWindowsServer() == 1 str = wxIsWindowsServer() == 1
? _("Windows Server 2012 R2") ? "Windows Server 2012 R2"
: _("Windows 8.1"); : "Windows 8.1";
break; break;
} }
break; break;
case 10: case 10:
str = wxIsWindowsServer() == 1 str = wxIsWindowsServer() == 1
? _("Windows Server 2016") ? "Windows Server 2016"
: _("Windows 10"); : "Windows 10";
break; break;
} }
if ( str.empty() ) if ( str.empty() )
{ {
str.Printf(_("Windows %lu.%lu"), str.Printf("Windows %lu.%lu",
info.dwMajorVersion, info.dwMajorVersion,
info.dwMinorVersion); info.dwMinorVersion);
} }