diff --git a/README.md b/README.md index 9a8f7d5..acfef3e 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ To create a translation file. ```shell ./setup.py create_translation --locale=fr ``` - -## For Development discussion - -You can join us at [#networkmgr](irc://irc.libera.chat:6697/networkmgr) on irc.libera.chat:6697 +To update all translation files +```shell +./setup.py update_translations +``` diff --git a/compile_translations.sh b/compile_translations.sh deleted file mode 100755 index aa5ceaa..0000000 --- a/compile_translations.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env sh - -msgfmt src/locale/zh_CN/networkmgr.po -o src/locale/zh_CN/networkmgr.mo -msgfmt src/locale/ru/networkmgr.po -o src/locale/ru/networkmgr.mo diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000..0d13a05 --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1,2 @@ +networkmgr +networkmgr_configuration diff --git a/src/locale/de/networkmgr.po b/po/de.po similarity index 100% rename from src/locale/de/networkmgr.po rename to po/de.po diff --git a/src/locale/nb_NO/networkmgr.po b/po/nb_NO.po similarity index 100% rename from src/locale/nb_NO/networkmgr.po rename to po/nb_NO.po diff --git a/po/pt_Br.po b/po/pt_Br.po index 4a8a93c..632763e 100644 --- a/po/pt_Br.po +++ b/po/pt_Br.po @@ -13,7 +13,7 @@ msgstr "" "Language-Team: Portuguese \n" "Language: pt_Br\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" diff --git a/src/locale/ru/networkmgr.po b/po/ru.po similarity index 100% rename from src/locale/ru/networkmgr.po rename to po/ru.po diff --git a/src/locale/sv/networkmgr.po b/po/sv.po similarity index 100% rename from src/locale/sv/networkmgr.po rename to po/sv.po diff --git a/setup.py b/setup.py index 2da8bbf..ab8c9cc 100755 --- a/setup.py +++ b/setup.py @@ -5,15 +5,16 @@ import sys from platform import system from subprocess import run - from setuptools import setup, Command, glob +from DistUtilsExtra.command.build_extra import build_extra +from DistUtilsExtra.command.build_i18n import build_i18n +from DistUtilsExtra.command.clean_i18n import clean_i18n -__VERSION__ = '6.6' +__VERSION__ = '6.7' PROGRAM_VERSION = __VERSION__ prefix = '/usr/local' if system() == 'FreeBSD' else sys.prefix - def datafilelist(installbase, sourcebase): datafileList = [] for root, subFolders, files in os.walk(sourcebase): @@ -77,7 +78,7 @@ def run(self): if not os.path.exists(po_file): print(f"Creating new {po_file} for locale '{self.locale}'...") os.makedirs(po_dir, exist_ok=True) - os.system(f'msginit --locale={self.locale} --input={pot_file} --output-file={po_file}') + os.system(f'msginit --locale={self.locale}.UTF-8 --input={pot_file} --output-file={po_file}') else: print(f"PO file for locale '{self.locale}' already exists: {po_file}") @@ -91,17 +92,13 @@ def run(self): data_files = [ (f'{prefix}/etc/xdg/autostart', ['src/networkmgr.desktop']), (f'{prefix}/share/networkmgr', networkmgr_share), - (f'{prefix}/share/locale/zh_CN/LC_MESSAGES', ['src/locale/zh_CN/networkmgr.mo']), - (f'{prefix}/share/locale/ru/LC_MESSAGES', ['src/locale/ru/networkmgr.mo']), - (f'{prefix}/etc/sudoers.d', ['src/sudoers.d/networkmgr']) + (f'{prefix}/etc/sudoers.d', ['src/sudoers.d/networkmgr']), + (f'{prefix}/etc/devd', ['src/networkmgr.conf']) ] -if os.path.exists('/etc/devd'): - data_files.append((f'{prefix}/etc/devd', ['src/networkmgr.conf'])) -if os.path.exists('/etc/devd-openrc'): - data_files.append((f'{prefix}/etc/devd-openrc', ['src/networkmgr.conf'])) - data_files.extend(datafilelist(f'{prefix}/share/icons/hicolor', 'src/icons')) +data_files.extend(datafilelist(f'{prefix}/share/locale', 'build/mo')) + setup( name="NetworkMgr", @@ -118,6 +115,9 @@ def run(self): cmdclass={ 'create_translation': CreateTranslationCommand, 'update_translations': UpdateTranslationsCommand, + "build": build_extra, + "build_i18n": build_i18n, + "clean": clean_i18n } ) diff --git a/src/locale/networkmgr.pot b/src/locale/networkmgr.pot deleted file mode 100644 index 319dc7d..0000000 --- a/src/locale/networkmgr.pot +++ /dev/null @@ -1,113 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-29 15:54+0800\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src/trayicon.py:67 -msgid "Ethernet Network" -msgstr "" - -#: src/trayicon.py:78 -#, python-format -msgid "Wired %s Connected" -msgstr "" - -#: src/trayicon.py:81 -msgid "Disable" -msgstr "" - -#: src/trayicon.py:86 -#, python-format -msgid "Wired %s Disconnected" -msgstr "" - -#: src/trayicon.py:89 -msgid "Enable" -msgstr "" - -#: src/trayicon.py:93 -#, python-format -msgid "Wired %s Unplug" -msgstr "" - -#: src/trayicon.py:101 -#, python-format -msgid "WiFi %s Disabled" -msgstr "" - -#: src/trayicon.py:104 -#, python-format -msgid "Enable Wifi %s" -msgstr "" - -#: src/trayicon.py:109 -#, python-format -msgid "WiFi %s Disconnected" -msgstr "" - -#: src/trayicon.py:113 src/trayicon.py:131 -#, python-format -msgid "Disable Wifi %s" -msgstr "" - -#: src/trayicon.py:119 -#, python-format -msgid "WiFi %s Connected" -msgstr "" - -#: src/trayicon.py:125 -#, python-format -msgid "Disconnect from %s" -msgstr "" - -#: src/trayicon.py:139 -msgid "Enable Networking" -msgstr "" - -#: src/trayicon.py:143 -msgid "Disable Networking" -msgstr "" - -#: src/trayicon.py:148 -msgid "Close Network Manager" -msgstr "" - -#: src/trayicon.py:156 -msgid "Available Connections" -msgstr "" - -#: src/trayicon.py:364 -msgid "Wi-Fi Network Authentication Required" -msgstr "" - -#: src/trayicon.py:376 -#, python-brace-format -msgid "{ssid_info[0]} Wi-Fi Network Authentication failed" -msgstr "" - -#: src/trayicon.py:378 -#, python-brace-format -msgid "Authentication required by {ssid_info[0]} Wi-Fi Network" -msgstr "" - -#: src/trayicon.py:381 -msgid "Password:" -msgstr "" - -#: src/trayicon.py:384 -msgid "Show password" -msgstr "" diff --git a/src/locale/zh_CN/networkmgr.po b/src/locale/zh_CN/networkmgr.po deleted file mode 100644 index 957b65a..0000000 --- a/src/locale/zh_CN/networkmgr.po +++ /dev/null @@ -1,114 +0,0 @@ -# Language locale/zh translations for PACKAGE package. -# Copyright (C) 2022 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# SAIHAZE , 2022. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-29 15:53+0800\n" -"PO-Revision-Date: 2022-05-02 22:30+0800\n" -"Last-Translator: SAIHAZE \n" -"Language-Team: Language locale/zh\n" -"Language: locale/zh_CN/LC_MESSAGES/networkmgr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src/trayicon.py:67 -msgid "Ethernet Network" -msgstr "以太网" - -#: src/trayicon.py:78 -#, python-format -msgid "Wired %s Connected" -msgstr "有线网络 %s 已连接" - -#: src/trayicon.py:81 -#, fuzzy -msgid "Disable" -msgstr "禁用" - -#: src/trayicon.py:86 -#, python-format -msgid "Wired %s Disconnected" -msgstr "有线网络 %s 已断开" - -#: src/trayicon.py:89 -#, fuzzy -msgid "Enable" -msgstr "启用" - -#: src/trayicon.py:93 -#, python-format -msgid "Wired %s Unplug" -msgstr "有线网络 %s 已拔出" - -#: src/trayicon.py:101 -#, python-format -msgid "WiFi %s Disabled" -msgstr "无线网络 %s 已禁用" - -#: src/trayicon.py:104 -#, python-format -msgid "Enable Wifi %s" -msgstr "启用无线网络 %s" - -#: src/trayicon.py:109 -#, python-format -msgid "WiFi %s Disconnected" -msgstr "无线网络 %s 已断开" - -#: src/trayicon.py:113 src/trayicon.py:131 -#, python-format -msgid "Disable Wifi %s" -msgstr "禁用无线网络 %s" - -#: src/trayicon.py:119 -#, python-format -msgid "WiFi %s Connected" -msgstr "无线网络 %s 已连接" - -#: src/trayicon.py:125 -#, python-format -msgid "Disconnect from %s" -msgstr "从 %s 断开" - -#: src/trayicon.py:139 -msgid "Enable Networking" -msgstr "启用网络" - -#: src/trayicon.py:143 -msgid "Disable Networking" -msgstr "禁用网络" - -#: src/trayicon.py:148 -msgid "Close Network Manager" -msgstr "关闭网络管理器" - -#: src/trayicon.py:156 -msgid "Available Connections" -msgstr "可用连接" - -#: src/trayicon.py:364 -msgid "Wi-Fi Network Authentication Required" -msgstr "无线网络需要认证" - -#: src/trayicon.py:376 -#, python-brace-format -msgid "{ssid_info[0]} Wi-Fi Network Authentication failed" -msgstr "{ssid_info[0]} 无线网络认证失败" - -#: src/trayicon.py:378 -#, python-brace-format -msgid "Authentication required by {ssid_info[0]} Wi-Fi Network" -msgstr "{ssid_info[0]} 无线网络需要认证" - -#: src/trayicon.py:381 -msgid "Password:" -msgstr "密码：" - -#: src/trayicon.py:384 -msgid "Show password" -msgstr "展示密码" diff --git a/src/setup-nic.py b/src/setup-nic.py index b7189c4..47b724d 100755 --- a/src/setup-nic.py +++ b/src/setup-nic.py @@ -59,7 +59,5 @@ def file_content(paths): if f'ifconfig_{nic}=' not in rc_conf_content: with rc_conf.open('a') as rc: rc.writelines(f'ifconfig_{nic}="DHCP"\n') - with open(f'/tmp/network-{nic}', 'w') as network: - network.writelines(f'attached') Popen(f'/etc/pccard_ether {nic} startchildren', shell=True) diff --git a/update_translations.sh b/update_translations.sh deleted file mode 100755 index 86a02ca..0000000 --- a/update_translations.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env sh - -xgettext src/trayicon.py -o src/locale/networkmgr.pot - -msgmerge -U src/locale/zh_CN/networkmgr.po src/locale/networkmgr.pot -msgmerge -U src/locale/ru/networkmgr.po src/locale/networkmgr.pot