From 54f06c0a76042f2e4696e44452db3b738eb2f657 Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Mon, 6 Sep 2004 09:53:49 +0000 Subject: [PATCH] libi2ncommon: (tomj) fix iso_to_html() function --- src/stringfunc.cpp | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/stringfunc.cpp b/src/stringfunc.cpp index 2caf99e..182dd26 100644 --- a/src/stringfunc.cpp +++ b/src/stringfunc.cpp @@ -82,14 +82,6 @@ std::string utf8_to_iso(const std::string& utf8string) std::string iso_to_html(const std::string& isostring, bool showerr_bug) { string result = isostring; - - replace_all (result, "ä", "ä"); - replace_all (result, "ö", "ö"); - replace_all (result, "ü", "ü"); - replace_all (result, "Ä", "Ä"); - replace_all (result, "Ö", "Ö"); - replace_all (result, "Ü", "Ü"); - replace_all (result, "ß", "ß"); // TODO: This needs to be removed soon by a proper // HTML quoted chars engine. Then we can also remove ü from i18n files. @@ -100,6 +92,14 @@ std::string iso_to_html(const std::string& isostring, bool showerr_bug) replace_all (result, ">", ">"); } + replace_all (result, "ä", "ä"); + replace_all (result, "ö", "ö"); + replace_all (result, "ü", "ü"); + replace_all (result, "Ä", "Ä"); + replace_all (result, "Ö", "Ö"); + replace_all (result, "Ü", "Ü"); + replace_all (result, "ß", "ß"); + return result; } -- 1.7.1