From 8b2dc19dbb96591eb77aae7d9749301660efb78c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 6 Sep 2015 14:24:17 +0200 Subject: [PATCH] Don't translate OS X codenames in wxGetOsDescription() OS X itself doesn't seem to do it. See https://github.com/wxWidgets/wxWidgets/pull/76#issuecomment-138067426 --- src/osx/cocoa/utils.mm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm index 78cd165708..545ebb6517 100644 --- a/src/osx/cocoa/utils.mm +++ b/src/osx/cocoa/utils.mm @@ -681,28 +681,31 @@ wxString wxGetOsDescription() int majorVer, minorVer; wxGetOsVersion(&majorVer, &minorVer); - wxString osBrand = _("OS X"); + // Notice that neither the OS name itself nor the code names seem to be + // ever translated, OS X itself uses the English words even for the + // languages not using Roman alphabet. + wxString osBrand = "OS X"; wxString osName; if (majorVer == 10) { switch (minorVer) { case 7: - osName = _("Lion"); + osName = "Lion"; // 10.7 was the last version where the "Mac" prefix was used - osBrand = _("Mac OS X"); + osBrand = "Mac OS X"; break; case 8: - osName = _("Mountain Lion"); + osName = "Mountain Lion"; break; case 9: - osName = _("Mavericks"); + osName = "Mavericks"; break; case 10: - osName = _("Yosemite"); + osName = "Yosemite"; break; case 11: - osName = _("El Capitan"); + osName = "El Capitan"; break; }; }