Better one

Author: sam52796

src/Lang.cpp

@@ -33,9 +33,13 @@ namespace Lang {
 		return true;
 	}
 
-	static void load_messages_from_json(const Json &data, const std::string &filename, Resource::StringMap &strings)
+	static bool load_messages_from_file(const std::string &filename, Resource::StringMap &strings)
 	{
-		for (Json::iterator i = data.begin(); i != data.end(); ++i) {
+		Json data = JsonUtils::LoadJsonDataFile(filename);
+		if (data.is_null())
+			return false;
+
+		for (Json::const_iterator i = data.begin(); i != data.end(); ++i) {
 			const std::string token = i.key();
 			if (token.empty()) {
 				Log::Info("{}: found empty token, skipping it\n", filename.c_str());
@@ -89,14 +93,6 @@ namespace Lang {
 
 			strings[token] = text;
 		}
-	}
-
-	static bool load_messages_from_file(const std::string &filename, Resource::StringMap &strings)
-	{
-		Json data = JsonUtils::LoadJsonDataFile(filename);
-		if (data.is_null())
-			return false;
-		load_messages_from_json(data, filename, strings);
 		return true;
 	}