summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChoe Hwanjin <choe.hwanjin@gmail.com>2016-03-29 13:46:44 +0900
committerChoe Hwanjin <choe.hwanjin@gmail.com>2016-03-29 13:46:44 +0900
commit8c1a3d95d879309a0754d1de861b4f82f80af4e3 (patch)
tree2e0f82b977d8e3f84680353f69f3f668ab504b10
parent48b19bdc1d0646fd9831326e97653da190cba203 (diff)
downloadlibhangul-8c1a3d95d879309a0754d1de861b4f82f80af4e3.tar.gz
ENABLE_NLS 처리 추가
intltool은 ENABLE_NLS를 정의하지 않는 것 같다. 대신 USE_NLS를 설정하므로 이 값으로 ENABLE_NLS 처리를 한다.
-rw-r--r--configure.ac3
-rw-r--r--hangul/hangulkeyboard.c2
-rw-r--r--tools/hangul.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index e527084..7cf9656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,9 @@ GETTEXT_PACKAGE="$PACKAGE"
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", gettext package name)
AM_ICONV
+if test x$USE_NLS = xyes; then
+ AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if translation of program messages is requested.])
+fi
# Checks for pkgconfig
PKG_PROG_PKG_CONFIG
diff --git a/hangul/hangulkeyboard.c b/hangul/hangulkeyboard.c
index 9ebaca6..53b9d74 100644
--- a/hangul/hangulkeyboard.c
+++ b/hangul/hangulkeyboard.c
@@ -881,7 +881,7 @@ hangul_builtin_keyboard_list_get_keyboard_name(unsigned index_)
if (keyboard == NULL)
return NULL;
- return keyboard->name;
+ return _(keyboard->name);
}
static const HangulKeyboard*
diff --git a/tools/hangul.c b/tools/hangul.c
index 507af4e..cd62ae6 100644
--- a/tools/hangul.c
+++ b/tools/hangul.c
@@ -137,7 +137,7 @@ list_keyboards()
// bind_textdomain_codeset() 함수가 불린후 다시 설정하도록 한다.
const char* codeset = nl_langinfo(CODESET);
if (codeset != NULL) {
- hangul_ic_get_keyboard_name(0);
+ hangul_keyboard_list_get_keyboard_name(0);
bind_textdomain_codeset(GETTEXT_PACKAGE, codeset);
}
}