Fix gettext textdomain binding

CMakeLists.txt

@@ -71,7 +71,7 @@ add_compile_definitions(
     PROJECT_SCHEMA_SECTION=chewing
     PROJECT_SCHEMA_DIR=/desktop/ibus/engine/chewing
     PROJECT_SCHEMA_PATH=/desktop/ibus/engine/chewing/
-    DATA_DIR=${CMAKE_INSTALL_DATADIR}
+    DATA_DIR=${CMAKE_INSTALL_FULL_DATADIR}
     PRJ_DATA_DIR=${PRJ_DATA_DIR}
     PRJ_VER=${PRJ_VER}
     LIBEXEC_DIR=${LIBEXEC_DIR}

po/CMakeLists.txt

@@ -1,8 +1,10 @@
+set(languages ca cs de es fr it ja ko pa pl pt_BR uk zh_CN zh_TW)
+
 include(FindGettext)
 
-foreach(lang ca cs de es fr it ja ko pa pl pt_BR uk zh_CN zh_TW)
+foreach(lang ${languages})
     GETTEXT_PROCESS_PO_FILES(${lang} ALL
-        INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR}
         PO_FILES ${lang}.po)
-endforeach()
-
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lang}.gmo DESTINATION
+        ${CMAKE_INSTALL_LOCALEDIR}/${lang}/LC_MESSAGES/ RENAME ibus-chewing.mo)
+endforeach()

po/ibus-chewing.pot

@@ -8,15 +8,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-10 09:15+0900\n"
+"POT-Creation-Date: 2024-02-10 16:42+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/setup/ibus-setup-chewing-window.ui:8
+msgid "Chewing Settings"
+msgstr ""
+
 #: src/setup/ibus-setup-chewing-window.ui:13
 msgid "Configure the input method"
 msgstr ""
@@ -93,198 +97,186 @@ msgstr ""
 msgid "Enable or disable automatic candidate selection"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:67
-msgid "Show Systray Icon"
-msgstr ""
-
-#: src/setup/ibus-setup-chewing-window.ui:68
-msgid "Whether to show the systray icon"
-msgstr ""
-
 #: src/setup/ibus-setup-chewing-window.ui:69
-msgid "This feature is currently not implemented."
-msgstr ""
-
-#: src/setup/ibus-setup-chewing-window.ui:77
 msgid "Editing"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:78
+#: src/setup/ibus-setup-chewing-window.ui:70
 msgid "Configure the input method behavior"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:82
+#: src/setup/ibus-setup-chewing-window.ui:74
 msgid "Auto Move Cursor"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:83
+#: src/setup/ibus-setup-chewing-window.ui:75
 msgid "Automatically move the cursor to the next character after selection"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:89
+#: src/setup/ibus-setup-chewing-window.ui:81
 msgid "Add Phrase Before Cursor"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:90
+#: src/setup/ibus-setup-chewing-window.ui:82
 msgid "Use Ctrl + Numbers (2-9) to save new phrase before or after the cursor"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:96
+#: src/setup/ibus-setup-chewing-window.ui:88
 msgid "Clear Pre-Edit Buffer When Focus Out"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:102
+#: src/setup/ibus-setup-chewing-window.ui:94
 msgid "Easy Symbol Input"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:103
+#: src/setup/ibus-setup-chewing-window.ui:95
 msgid "Press Shift + keys to input Chinese punctuation symbols"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:108
+#: src/setup/ibus-setup-chewing-window.ui:100
 msgid "Esc Clean All Buffer"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:109
+#: src/setup/ibus-setup-chewing-window.ui:101
 msgid "Escape key discards all uncommitted texts"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:122
+#: src/setup/ibus-setup-chewing-window.ui:114
 msgid "Maximum Chinese Characters"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:123
+#: src/setup/ibus-setup-chewing-window.ui:115
 msgid "Until how many characters should trigger auto-commit"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:128
+#: src/setup/ibus-setup-chewing-window.ui:120
 msgid "Chinese/Alphanumeric Mode Toggle Key"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:132
+#: src/setup/ibus-setup-chewing-window.ui:124
 msgid "Caps Lock"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:133
+#: src/setup/ibus-setup-chewing-window.ui:125
 msgid "Shift"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:134
+#: src/setup/ibus-setup-chewing-window.ui:126
 msgid "Shift_L"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:135
+#: src/setup/ibus-setup-chewing-window.ui:127
 msgid "Shift_R"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:146
+#: src/setup/ibus-setup-chewing-window.ui:138
 msgid "Disable Syncing"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:147
+#: src/setup/ibus-setup-chewing-window.ui:139
 msgid "Sync with Keyboard State"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:151
+#: src/setup/ibus-setup-chewing-window.ui:143
 msgid "Sync Caps Lock and IM"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:159
+#: src/setup/ibus-setup-chewing-window.ui:151
 msgid "No Default"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:160
+#: src/setup/ibus-setup-chewing-window.ui:152
 msgid "Lower Case"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:161
+#: src/setup/ibus-setup-chewing-window.ui:153
 msgid "Upper Case"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:165
+#: src/setup/ibus-setup-chewing-window.ui:157
 msgid "Default English Letter Case"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:166
+#: src/setup/ibus-setup-chewing-window.ui:158
 msgid "The letter case without pressing the Shift key"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:173
+#: src/setup/ibus-setup-chewing-window.ui:165
 msgid "Selecting"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:174
+#: src/setup/ibus-setup-chewing-window.ui:166
 msgid "Configure the candidate selection behavior"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:185
+#: src/setup/ibus-setup-chewing-window.ui:177
 msgid "Candidates Per Page"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:191
+#: src/setup/ibus-setup-chewing-window.ui:183
 msgid "Show Page Number"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:197
+#: src/setup/ibus-setup-chewing-window.ui:189
 msgid "Choose Phrases Backwards"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:198
+#: src/setup/ibus-setup-chewing-window.ui:190
 msgid "Open candidate list from the last character of a phrase"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:204
+#: src/setup/ibus-setup-chewing-window.ui:196
 msgid "Use Space Key as Selection Key"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:210
+#: src/setup/ibus-setup-chewing-window.ui:202
 msgid "Use Vertical Candidate Panel"
 msgstr ""
 
-#: src/setup/ibus-setup-chewing-window.ui:211
+#: src/setup/ibus-setup-chewing-window.ui:203
 msgid "Choose from vertical or horizontal panel"
 msgstr ""
 
-#: src/main.c:67
-msgid "Cannot connect to IBus!"
-msgstr ""
-
-#: src/main.c:94
-msgid "Chewing"
-msgstr ""
-
-#: src/main.c:95
-msgid "Chinese chewing input method"
-msgstr ""
-
-#: src/ibus-chewing-engine.c:340
+#: src/ibus-chewing-engine.c:339
 msgid "Switch to Alphanumeric Mode"
 msgstr ""
 
-#: src/ibus-chewing-engine.c:342
+#: src/ibus-chewing-engine.c:341
 msgid "Switch to Chinese Mode"
 msgstr ""
 
-#: src/ibus-chewing-engine.c:345
+#: src/ibus-chewing-engine.c:344
 msgid "Click to toggle Chinese/Alphanumeric Mode"
 msgstr ""
 
-#: src/ibus-chewing-engine.c:351
+#: src/ibus-chewing-engine.c:350
 msgid "Fullwidth Form"
 msgstr ""
 
-#: src/ibus-chewing-engine.c:353
+#: src/ibus-chewing-engine.c:352
 msgid "Halfwidth Form"
 msgstr ""
 
-#: src/ibus-chewing-engine.c:356
+#: src/ibus-chewing-engine.c:355
 msgid "Click to toggle Halfwidth/Fullwidth Form"
 msgstr ""
 
-#: src/ibus-chewing-engine.c:362
+#: src/ibus-chewing-engine.c:361
 msgid "IBus-Chewing Preferences"
 msgstr ""
 
-#: src/ibus-chewing-engine.c:364
+#: src/ibus-chewing-engine.c:363
 msgid "Click to configure IBus-Chewing"
 msgstr ""
+
+#: src/main.c:67
+msgid "Cannot connect to IBus!"
+msgstr ""
+
+#: src/main.c:94
+msgid "Chewing"
+msgstr ""
+
+#: src/main.c:95
+msgid "Chinese chewing input method"
+msgstr ""

src/CMakeLists.txt

@@ -59,8 +59,8 @@ add_executable(ibus-setup-chewing
     ${CMAKE_CURRENT_BINARY_DIR}/ibus-setup-chewing-window-ui.c
 )
 target_compile_definitions(ibus-setup-chewing PRIVATE
-    GETTEXT_PACKAGE="ibus-setup-chewing"
-    LOCALEDIR="${CMAKE_INSTALL_LOCALEDIR}"
+    GETTEXT_PACKAGE="ibus-chewing"
+    LOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}"
 )
 target_include_directories(ibus-setup-chewing PRIVATE setup)
 target_link_libraries(ibus-setup-chewing PkgConfig::LIBADWAITA)

src/IBusChewingProperties.c

@@ -1,4 +1,3 @@
-#define GETTEXT_PACKAGE "gtk30"
 #include "IBusChewingProperties.h"
 #include "GSettingsBackend.h"
 #include "IBusChewingUtil.h"

src/ibus-chewing-engine-private.h

@@ -19,19 +19,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  * USA.
  */
-#include <chewing.h>
-#include <ibus.h>
-#include <libintl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#define GETTEXT_PACKAGE "gtk30"
 #include "GSettingsBackend.h"
 #include "IBusChewingPreEdit.h"
 #include "IBusChewingProperties.h"
 #include "IBusChewingUtil.h"
+#include <chewing.h>
 #include <ctype.h>
 #include <glib/gi18n.h>
+#include <ibus.h>
+#include <libintl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #ifndef __IBUS_CHEWING_ENGINE_PRIVATE_H__
 #define __IBUS_CHEWING_ENGINE_PRIVATE_H__

src/ibus-chewing-engine.c

@@ -19,20 +19,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  * USA.
  */
-#include <chewing.h>
-#include <ibus.h>
-#include <libintl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#define GETTEXT_PACKAGE "gtk30"
 #include "GSettingsBackend.h"
 #include "IBusChewingPreEdit.h"
 #include "IBusChewingProperties.h"
 #include "IBusChewingUtil.h"
+#include <chewing.h>
 #include <ctype.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <ibus.h>
+#include <libintl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define GOB_VERSION_MAJOR 2
 #define GOB_VERSION_MINOR 0

src/ibus-chewing-engine.h

@@ -19,20 +19,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  * USA.
  */
-#include <chewing.h>
-#include <ibus.h>
-#include <libintl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#define GETTEXT_PACKAGE "gtk30"
 #include "GSettingsBackend.h"
 #include "IBusChewingPreEdit.h"
 #include "IBusChewingProperties.h"
 #include "IBusChewingUtil.h"
+#include <chewing.h>
 #include <ctype.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <ibus.h>
+#include <libintl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <glib-object.h>
 #include <glib.h>