Skip to content
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.

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

show linux screenshot with chinese locale #239

Merged
merged 1 commit into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
72 changes: 72 additions & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,58 @@ jobs:
sudo apt-get install lwm fvwm
sudo apt-get install xvfb

- name: show installed font packages
run: |
dpkg -l|grep font

- name: install fonts
run: |
sudo apt-get install xfonts-utils xfonts-scalable xfonts-encodings xfonts-base xfonts-75dpi xfonts-100dpi
sudo apt-get install fonts-noto-color-emoji
sudo apt-get install fonts-dejavu fonts-dejavu-core fonts-freefont-ttf
sudo apt-get install xfonts-wqy \
xfonts-efont-unicode xfonts-efont-unicode-ib xfonts-intl-chinese xfonts-intl-chinese-big \
xfonts-intl-asian xfonts-intl-arabic xfonts-intl-european xfonts-unifont \
fonts-dejavu-core \
fonts-dejavu-extra \
fonts-droid-fallback \
fonts-guru \
fonts-guru-extra \
fonts-horai-umefont \
fonts-kacst \
fonts-kacst-one \
fonts-khmeros-core \
fonts-lao \
fonts-liberation \
fonts-lklug-sinhala \
fonts-lohit-guru \
fonts-nanum \
fonts-noto-cjk \
fonts-opensymbol \
fonts-roboto \
fonts-roboto-hinted \
fonts-sil-abyssinica \
fonts-sil-padauk \
fonts-stix \
fonts-symbola \
fonts-takao-pgothic \
fonts-thai-tlwg \
fonts-tibetan-machine \
fonts-tlwg-garuda \
fonts-tlwg-kinnari \
fonts-tlwg-laksaman \
fonts-tlwg-loma \
fonts-tlwg-mono \
fonts-tlwg-norasi \
fonts-tlwg-purisa \
fonts-tlwg-sawasdee \
fonts-tlwg-typewriter \
fonts-tlwg-typist \
fonts-tlwg-typo \
fonts-tlwg-umpush \
fonts-tlwg-waree \
fonts-unfonts-core

# use the ipv6-boot-only version of the tox tester
- name: download tester
shell: bash
Expand All @@ -744,6 +796,7 @@ jobs:
run: |
printf '#!/bin/bash\n' > /tmp/a.sh
printf 'xclock -digital -geometry 300x45+100+688 &\n' >> /tmp/a.sh
printf 'export LC_ALL=zh_CN.utf8\n' >> /tmp/a.sh
printf '/home/runner/work/trifa_material/trifa_material/gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64/ run &\n' >> /tmp/a.sh
printf 'sleep 20\n' >> /tmp/a.sh
printf 'xwininfo -id $(xdotool getactivewindow)\n' >> /tmp/a.sh
Expand Down Expand Up @@ -792,10 +845,29 @@ jobs:
tools/patch_src_disable_ipv4_boots.sh
git diff||echo "NO ERR"

- name: generate locale
run: |
cat /etc/locale.gen
cat /etc/locale.gen|grep -i zn||echo "NO ERR"
echo "zh_CN.UTF-8 UTF-8" |sudo tee -a /etc/locale.gen
sudo locale-gen

- name: generate locale
run: |
sudo localectl set-locale LANG="zh_CN.UTF-8"
export LANG="zh_CN.UTF-8"
sudo update-locale
locale -a
locale
locale -c -k LC_NUMERIC
sudo update-locale LANG="zh_CN.UTF-8"
localectl status

- name: startup-app
run: |
pwd
ls -al
export LC_ALL=zh_CN.utf8
./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64/ assemble
xvfb-run --server-args="-screen 0 1024x768x24" --auto-servernum /tmp/a.sh
echo "++++++++++++++++++"
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/Main.kt
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ fun App()
}
Log.i(TAG, "is started now")
tox_running_state = tox_running_state_wrapper
start_button_text = "stop"
start_button_text = i18n("ui.start_button.stop")
}.start()
TrifaToxService.stop_me = false
savepathstore.createPathDirectories()
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/strings/trifa_material.properties
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ ui.group.enter_group_name=enter Group Name
ui.group.created_new_public=You created new public Group
ui.group.created_public=Create new public Group
ui.setting.test_notification=test Notification

ui.start_button.stop=stop


1 change: 1 addition & 0 deletions src/main/resources/strings/trifa_material_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ access.logo=logo
about.trifa_material_version=Version matérielle de TRIfA
ui.ui_scale=Échelle d'interface
ui.access_group_list=Accéder à la liste de groupes
ui.start_button.stop=cesser
1 change: 1 addition & 0 deletions src/main/resources/strings/trifa_material_zh_CN.properties
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ ui.generic_error=出了亿点错误
ui.friend_settings_headline=好友设置
ui.tox_proxy_selected=中继(ToxProxy)
ui.explain_what_toxproxy_is=这是联系人列表中一名联系人的中继(ToxProxy)\n它是可用于离线消息的特别联系人
ui.start_button.stop=停止
Loading