From 2707e55f48685452892e40e95b19655880f0e042 Mon Sep 17 00:00:00 2001
From: mrwastl <mrwastl@users.sourceforge.net>
Date: Sat, 8 May 2010 17:11:07 +0200
Subject: use character set of VDR. if not configured: return default one

---
 skinconfig.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'skinconfig.c')

diff --git a/skinconfig.c b/skinconfig.c
index 9e4b2ce..0275910 100644
--- a/skinconfig.c
+++ b/skinconfig.c
@@ -268,7 +268,19 @@ std::string cGraphLCDSkinConfig::FontPath(void)
 
 std::string cGraphLCDSkinConfig::CharSet(void)
 {
-    return "iso-8859-15";
+#if APIVERSNUM >= 10503
+    if (cCharSetConv::SystemCharacterTable()) {
+      return cCharSetConv::SystemCharacterTable();
+    } else {
+      return "UTF-8";
+    }
+#else
+    if (I18nCharSets()[Setup.OSDLanguage]) {
+      return I18nCharSets()[Setup.OSDLanguage];
+    } else {
+      return "iso-8859-15";
+    }
+#endif
 }
 
 std::string cGraphLCDSkinConfig::Translate(const std::string & Text)
-- 
cgit v1.2.3