From 12f29d444100195f19d79613cae76cdea1c2aacb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Wed, 24 Sep 2014 21:24:41 +0200 Subject: [PATCH] HaikuDepot: Force preferred language to be supported At the moment, the web-app has a defined, limited set of supported languages for translations. JSON requests fail when asking for an unsupported language code. For the time being, force the language code to be in the supported set. --- src/apps/haikudepot/Model.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/apps/haikudepot/Model.cpp b/src/apps/haikudepot/Model.cpp index 03473597b0..ce00590668 100644 --- a/src/apps/haikudepot/Model.cpp +++ b/src/apps/haikudepot/Model.cpp @@ -340,6 +340,14 @@ Model::Model() language.CopyInto(fPreferredLanguage, 0, 2); } } + if (fPreferredLanguage != "en" && fPreferredLanguage != "de" + && fPreferredLanguage != "fr" && fPreferredLanguage != "ja" + && fPreferredLanguage != "es" && fPreferredLanguage != "zh" + && fPreferredLanguage != "pt" && fPreferredLanguage != "ru") { + // Force the preferred language to one of the currently supported + // ones, until the web application supports all ISO language codes. + fPreferredLanguage = "en"; + } fWebAppInterface.SetPreferredLanguage(fPreferredLanguage); }