diff options
| author | Ales Kozumplik <akozumpl@redhat.com> | 2011-10-05 12:18:53 +0200 |
|---|---|---|
| committer | Ales Kozumplik <akozumpl@redhat.com> | 2011-10-10 13:04:55 +0200 |
| commit | fd6085f6c5812373d4b1bdbefd6a10aa9eff2e61 (patch) | |
| tree | 503ad3d46df5e845240f64b8f59b1600028fd2ec /loader | |
| parent | 2cb3a3e88db4d997e20725f62714256160ec4e65 (diff) | |
| download | anaconda-fd6085f6c5812373d4b1bdbefd6a10aa9eff2e61.tar.gz anaconda-fd6085f6c5812373d4b1bdbefd6a10aa9eff2e61.tar.xz anaconda-fd6085f6c5812373d4b1bdbefd6a10aa9eff2e61.zip | |
LANG_DEFAULT lives in lang.c.
Related: rhbz#731356
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/lang.c | 4 | ||||
| -rw-r--r-- | loader/lang.h | 4 | ||||
| -rw-r--r-- | loader/loader.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/loader/lang.c b/loader/lang.c index 24878a7d5..6b1fa8e4f 100644 --- a/loader/lang.c +++ b/loader/lang.c @@ -47,6 +47,8 @@ #include "../pyanaconda/isys/isys.h" #include "../pyanaconda/isys/log.h" +const char *LANG_DEFAULT = "en_US.UTF-8"; + /* boot flags */ extern uint64_t flags; @@ -368,7 +370,7 @@ static char * getLangNick(char * oldLang) { return lang; } -int setLanguage (char * key, int forced) { +int setLanguage (const char * key, int forced) { int i; if (!languages) loadLanguageList(); diff --git a/loader/lang.h b/loader/lang.h index d4b61dd89..168ffa37e 100644 --- a/loader/lang.h +++ b/loader/lang.h @@ -32,7 +32,9 @@ struct langInfo { int chooseLanguage(char ** lang); char * translateString(char * str); -int setLanguage (char * key, int forced); +int setLanguage (const char * key, int forced); int getLangInfo(struct langInfo **langs); +extern const char *LANG_DEFAULT; + #endif /* _LANG_H_ */ diff --git a/loader/loader.c b/loader/loader.c index e03627c2c..a022f429e 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -128,7 +128,6 @@ int num_link_checks = 5; int post_link_sleep = 0; static int init_sig = SIGUSR1; /* default to shutdown=halt */ -static const char *LANG_DEFAULT = "en_US.UTF-8"; static char *VIRTIO_PORT = "/dev/virtio-ports/org.fedoraproject.anaconda.log.0"; @@ -2063,7 +2062,7 @@ int main(int argc, char ** argv) { if (loaderData.lang && loaderData.lang_set == 1) { setLanguage(loaderData.lang, 1); } else { - setLanguage("en_US.UTF-8", 1); + setLanguage(LANG_DEFAULT, 1); } /* FIXME: this is a bit of a hack */ |