Skip to content

enter key translations #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 18, 2025
Merged

enter key translations #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ build
*.tar.bz2
*.zip
meta.swift
assets/en.lproj/Localizable.strings
assets/SwiftTranslations/Main/en.lproj/Localizable.strings
assets/SwiftTranslations/Keyboard/en.lproj/Localizable.strings
2 changes: 0 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ add_subdirectory(engines)

fcitx5_get_addon_targets(COMMON_TARGETS iosnotifications fcitx5 iosfrontend uipanel)

set(LOCALES en zh-Hans)
list(TRANSFORM LOCALES APPEND ".lproj" OUTPUT_VARIABLE LPROJS)
add_subdirectory(assets)
add_subdirectory(common)
add_subdirectory(keyboard)
Expand Down
21 changes: 15 additions & 6 deletions assets/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,28 @@ add_custom_target(png_images ALL
execute_process(COMMAND "${PROJECT_SOURCE_DIR}/scripts/generate-icons.sh")

# I18n
list(TRANSFORM LPROJS PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/" OUTPUT_VARIABLE LPROJ_DIRS)
list(TRANSFORM LPROJ_DIRS APPEND "/Localizable.strings" OUTPUT_VARIABLE LOCALIZABLE_STRINGS_FILES)
set(LOCALES en zh-Hans)
list(TRANSFORM LOCALES APPEND ".lproj" OUTPUT_VARIABLE LPROJS)

list(TRANSFORM LPROJS PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/SwiftTranslations/Main/" OUTPUT_VARIABLE LOCALIZABLE_STRINGS_FILES)
list(TRANSFORM LOCALIZABLE_STRINGS_FILES APPEND "/Localizable.strings")

list(TRANSFORM LPROJS PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/SwiftTranslations/Keyboard/" OUTPUT_VARIABLE KEYBOARD_LOCALIZABLE_STRINGS_FILES)
list(TRANSFORM KEYBOARD_LOCALIZABLE_STRINGS_FILES APPEND "/Localizable.strings")

file(GLOB_RECURSE LOCALIZABLE_SWIFT_SOURCES ${PROJECT_SOURCE_DIR}/src/*.swift)
file(GLOB_RECURSE KEYBOARD_LOCALIZABLE_SWIFT_SOURCES ${PROJECT_SOURCE_DIR}/uipanel/*.swift)

add_custom_command(
OUTPUT ${LOCALIZABLE_STRINGS_FILES}
COMMAND genstrings ${LOCALIZABLE_SWIFT_SOURCES} -SwiftUI -o ${CMAKE_CURRENT_SOURCE_DIR}/en.lproj
OUTPUT ${LOCALIZABLE_STRINGS_FILES} ${KEYBOARD_LOCALIZABLE_STRINGS_FILES}
COMMAND genstrings ${LOCALIZABLE_SWIFT_SOURCES} -SwiftUI -o ${CMAKE_CURRENT_SOURCE_DIR}/SwiftTranslations/Main/en.lproj
COMMAND ${PROJECT_SOURCE_DIR}/scripts/update_translations.py ${LOCALIZABLE_STRINGS_FILES}
DEPENDS ${LOCALIZABLE_SWIFT_SOURCES}
COMMAND genstrings ${KEYBOARD_LOCALIZABLE_SWIFT_SOURCES} -SwiftUI -o ${CMAKE_CURRENT_SOURCE_DIR}/SwiftTranslations/Keyboard/en.lproj
COMMAND ${PROJECT_SOURCE_DIR}/scripts/update_translations.py ${KEYBOARD_LOCALIZABLE_STRINGS_FILES}
DEPENDS ${LOCALIZABLE_SWIFT_SOURCES} ${KEYBOARD_LOCALIZABLE_SWIFT_SOURCES}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Generating Localizable.strings..."
)
add_custom_target(GenerateStrings
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/en.lproj/Localizable.strings
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/SwiftTranslations/Main/en.lproj/Localizable.strings
)
1 change: 1 addition & 0 deletions assets/SwiftTranslations/Chinese/en.lproj/InfoPlist.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CFBundleDisplayName = "Chinese";
1 change: 1 addition & 0 deletions assets/SwiftTranslations/Chinese/zh-Hans.lproj/InfoPlist.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CFBundleDisplayName = "中文";
1 change: 1 addition & 0 deletions assets/SwiftTranslations/Hallelujah/en.lproj/InfoPlist.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CFBundleDisplayName = "Hallelujah";
1 change: 1 addition & 0 deletions assets/SwiftTranslations/Hallelujah/zh-Hans.lproj/InfoPlist.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CFBundleDisplayName = "哈利路亚";
Binary file added assets/SwiftTranslations/Keyboard/zh-Hans.lproj/Localizable.strings
View file
Open in desktop
Binary file not shown.
0 assets/en.lproj/InfoPlist.strings → ...nslations/Main/en.lproj/InfoPlist.strings
View file
Open in desktop
File renamed without changes.
0 assets/zh-Hans.lproj/InfoPlist.strings → ...ions/Main/zh-Hans.lproj/InfoPlist.strings
View file
Open in desktop
File renamed without changes.
0 assets/zh-Hans.lproj/Localizable.strings → ...ns/Main/zh-Hans.lproj/Localizable.strings
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions assets/SwiftTranslations/Mozc/en.lproj/InfoPlist.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CFBundleDisplayName = "Mozc";
1 change: 1 addition & 0 deletions assets/SwiftTranslations/Mozc/zh-Hans.lproj/InfoPlist.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CFBundleDisplayName = "Mozc";
1 change: 1 addition & 0 deletions assets/SwiftTranslations/Rime/en.lproj/InfoPlist.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CFBundleDisplayName = "Rime";
1 change: 1 addition & 0 deletions assets/SwiftTranslations/Rime/zh-Hans.lproj/InfoPlist.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CFBundleDisplayName = "中州韵";
3 changes: 3 additions & 0 deletions keyboard/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,7 @@ function(add_keyboard_extension keyboard language targets)
REGISTRY_VARNAME getStaticAddon
ADDONS ${COMMON_TARGETS} ${targets}
)

copy_to(${keyboard} copy_directory "${PROJECT_SOURCE_DIR}/assets/SwiftTranslations/${keyboard}" "")
copy_to(${keyboard} copy_directory "${PROJECT_SOURCE_DIR}/assets/SwiftTranslations/Keyboard" "")
endfunction()
4 changes: 1 addition & 3 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,7 @@ endforeach()

copy_to(app copy "${PROJECT_BINARY_DIR}/profile" profile)

foreach(LPROJ IN LISTS LPROJS)
copy_to(app copy_directory "${PROJECT_SOURCE_DIR}/assets/${LPROJ}" "${LPROJ}")
endforeach()
copy_to(app copy_directory "${PROJECT_SOURCE_DIR}/assets/SwiftTranslations/Main" "")

fcitx5_import_addons(${BUNDLE_NAME}
REGISTRY_VARNAME getStaticAddon
Expand Down