Page MenuHomePhabricator (Chris)
Files F126597

No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/util/language-string.cpp b/util/language-string.cpp
index ba49b779..cf007977 100644
--- a/util/language-string.cpp
+++ b/util/language-string.cpp
@@ -1,43 +1,48 @@
#include <string>
#include "language-string.h"
+#include "configuration.h"
using namespace std;
LanguageString::LanguageString(){
}
LanguageString::LanguageString(const std::string & stuff){
add(stuff);
}
LanguageString::LanguageString(const char * stuff){
add(stuff);
}
LanguageString::LanguageString(const std::string & stuff, const std::string & language){
add(stuff, language);
}
LanguageString::LanguageString(const LanguageString & language){
languages = language.languages;
}
LanguageString & LanguageString::operator=(const LanguageString & obj){
this->languages = obj.languages;
return *this;
}
void LanguageString::add(const std::string & stuff, const std::string & language){
languages[language] = stuff;
}
void LanguageString::add(const std::string & stuff){
add(stuff, defaultLanguage());
}
+const string LanguageString::currentLanguage() const {
+ return Configuration::getLanguage();
+}
+
const std::string & LanguageString::get(){
if (languages[currentLanguage()] != ""){
return languages[currentLanguage()];
}
return languages[defaultLanguage()];
}
diff --git a/util/language-string.h b/util/language-string.h
index ac1d77d1..b996e6a6 100644
--- a/util/language-string.h
+++ b/util/language-string.h
@@ -1,40 +1,38 @@
#ifndef _paintown_language_string_h
#define _paintown_language_string_h
#include <string>
#include <map>
class LanguageString: public std::string {
public:
LanguageString();
LanguageString(const char * stuff);
LanguageString(const std::string & stuff);
LanguageString(const std::string & stuff, const std::string & language);
LanguageString(const LanguageString & language);
LanguageString & operator=(const LanguageString & obj);
static const std::string defaultLanguage(){
return "English";
}
- const std::string currentLanguage() const {
- return "English";
- }
+ const std::string currentLanguage() const;
/* add a new language translation */
void add(const std::string & stuff, const std::string & language);
/* adds with the default language */
void add(const std::string & stuff);
const std::string & get();
inline const std::map<std::string, std::string> & getLanguages() const {
return languages;
}
protected:
std::map<std::string, std::string> languages;
};
#endif

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jun 11, 12:08 PM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
68961
Default Alt Text
(2 KB)

Event Timeline