[Libreoffice-commits] online.git: 2 commits - Mobile/Mobile Mobile/Mobile.xcodeproj

[Libreoffice Gerrit user]

 Mobile/Mobile.xcodeproj/project.pbxproj |   12 ++++++++++++
 Mobile/Mobile/Document.mm               |    3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 705bf6e8dc4637c1cee17236733af5ead64ebaff
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Nov 12 20:13:23 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Nov 12 20:14:10 2018 +0200

    What we want is [[NSLocale preferredLanguages] firstObject]
    
    Not [NSLocale currentLocale]. See
    https://stackoverflow.com/questions/3910244/getting-current-device-language-in-ios .
    
    Change-Id: I14490f6b8c910c3fc1a0b7780bcfdd6b53553678

diff --git a/Mobile/Mobile/Document.mm b/Mobile/Mobile/Document.mm
index d27bf2092..c2614f253 100644
--- a/Mobile/Mobile/Document.mm
+++ b/Mobile/Mobile/Document.mm
@@ -15,6 +15,7 @@
 
 #define LIBO_INTERNAL_ONLY
 #include <sal/config.h>
+#include <sal/log.hxx>
 #include <rtl/ustring.hxx>
 #include <comphelper/lok.hxx>
 #include <i18nlangtag/languagetag.hxx>
@@ -50,7 +51,7 @@
     if (lang != nullptr)
         locale = [NSString stringWithUTF8String:lang];
     else
-        locale = [NSLocale currentLocale].languageCode;
+        locale = [[NSLocale preferredLanguages] firstObject];
 
     comphelper::LibreOfficeKit::setLanguageTag(LanguageTag(OUString::fromUtf8(OString([locale UTF8String])), true));
 
commit 139809286f892ba4b06c48f8f60b2b8628628d12
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Nov 12 20:09:26 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Nov 12 20:14:10 2018 +0200

    Add two source files from i18nlangtag
    
    Change-Id: Ic0b24d395dd8f74ce7d18a6e16cd5f61da4b4c01

diff --git a/Mobile/Mobile.xcodeproj/project.pbxproj b/Mobile/Mobile.xcodeproj/project.pbxproj
index 4ac376418..a3adce50a 100644
--- a/Mobile/Mobile.xcodeproj/project.pbxproj
+++ b/Mobile/Mobile.xcodeproj/project.pbxproj
@@ -455,6 +455,8 @@
 		BEA8CD7D21959343009FE17E /* localedatawrapper.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = localedatawrapper.cxx; path = "../../ios-device/unotools/source/i18n/localedatawrapper.cxx"; sourceTree = "<group>"; };
 		BEA8CD7E21959343009FE17E /* resmgr.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = resmgr.cxx; path = "../../ios-device/unotools/source/i18n/resmgr.cxx"; sourceTree = "<group>"; };
 		BEA8CDC32199AC9D009FE17E /* lok.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lok.cxx; path = "../../ios-device/comphelper/source/misc/lok.cxx"; sourceTree = "<group>"; };
+		BEA8CDC52199E621009FE17E /* languagetagicu.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = languagetagicu.cxx; path = "../../ios-device/i18nlangtag/source/languagetag/languagetagicu.cxx"; sourceTree = "<group>"; };
+		BEA8CDC62199E621009FE17E /* languagetag.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = languagetag.cxx; path = "../../ios-device/i18nlangtag/source/languagetag/languagetag.cxx"; sourceTree = "<group>"; };
 		BEB6521C216F5D8B00B8C09A /* file_path_helper.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = file_path_helper.hxx; path = "../../ios-device/sal/osl/unx/file_path_helper.hxx"; sourceTree = "<group>"; };
 		BEB6521D216F5D8B00B8C09A /* file_error_transl.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = file_error_transl.hxx; path = "../../ios-device/sal/osl/unx/file_error_transl.hxx"; sourceTree = "<group>"; };
 		BEB6521E216F5D8B00B8C09A /* nlsupport.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = nlsupport.hxx; path = "../../ios-device/sal/osl/unx/nlsupport.hxx"; sourceTree = "<group>"; };
@@ -946,6 +948,7 @@
 			children = (
 				BEA8CDC12199AC7A009FE17E /* comphelper */,
 				BE34D182218CFC6C00815297 /* desktop */,
+				BEA8CDC42199E5ED009FE17E /* i18nlangtag */,
 				BEB6521A216F5D4600B8C09A /* sal */,
 				BE93D43C216D555C007A39F4 /* sfx2 */,
 				BE34D1892190712C00815297 /* sc */,
@@ -1168,6 +1171,15 @@
 			name = misc;
 			sourceTree = "<group>";
 		};
+		BEA8CDC42199E5ED009FE17E /* i18nlangtag */ = {
+			isa = PBXGroup;
+			children = (
+				BEA8CDC62199E621009FE17E /* languagetag.cxx */,
+				BEA8CDC52199E621009FE17E /* languagetagicu.cxx */,
+			);
+			name = i18nlangtag;
+			sourceTree = "<group>";
+		};
 		BEB6521A216F5D4600B8C09A /* sal */ = {
 			isa = PBXGroup;
 			children = (