1 files changed, 7 insertions, 11 deletions
diff --git a/i18n.h b/i18n.h
index 25ba0a3..14478af 100644
--- a/i18n.h
+++ b/i18n.h
@@ -1,6 +1,7 @@
 #ifndef VDR_LIVE_I18N_H
 #define VDR_LIVE_I18N_H
 
+#include <string>
 #include <vdr/config.h>
 #include <vdr/i18n.h>
 
@@ -10,19 +11,14 @@ class I18n
 {
 	friend I18n& LiveI18n();
 
-	char const* m_encoding; 
+	private:
+		std::string m_encoding;
 
-	I18n( I18n const& ); // don't copy
-	I18n() : m_encoding( 
-#if VDRVERSNUM >= 10503
-		cCharSetConv::SystemCharacterTable() ? cCharSetConv::SystemCharacterTable() : "UTF-8"
-#else
-		I18nCharSets()[::Setup.OSDLanguage]
-#endif
-		) {}
+		I18n( I18n const& ); // don't copy
+		I18n();
 
-public:
-	char const* CharacterEncoding() const { return m_encoding; }
+	public:
+		std::string const& CharacterEncoding() const { return m_encoding; }
 };
 
 I18n& LiveI18n();