Work on localization and some small fixes

This commit is contained in:
thooge committed 2026-10-17 08:34:54 +02:00
1 parent 3a43f749f5
commit ee947b772f
6 files changed
+1189 -288

No files matched your search

+2 -1
View File
@@ -28,7 +28,8 @@ prepare: ymsgui.py yms/*.py yms/ui/*.ui
xgettext -L Python -o locale/program.pot ymsgui.py yms/*.py xgettext -L Python -o locale/program.pot ymsgui.py yms/*.py
xgettext -L Python -o locale/views.pot ymsgui.py yms/view/*.py xgettext -L Python -o locale/views.pot ymsgui.py yms/view/*.py
xgettext -L Glade -o locale/ui.pot yms/ui/*.ui xgettext -L Glade -o locale/ui.pot yms/ui/*.ui
msgcat -o locale/combined.pot locale/program.pot locale/views.pot locale/ui.pot db/localize.py db/mariadb.sql > locale/db.pot
msgcat -o locale/combined.pot locale/program.pot locale/views.pot locale/ui.pot locale/db.pot
msgmerge -U locale/de.po locale/combined.pot msgmerge -U locale/de.po locale/combined.pot
translation: locale/de/LC_MESSAGES/ymsgui.mo translation: locale/de/LC_MESSAGES/ymsgui.mo
Executable
+90
View File
@@ -0,0 +1,90 @@
#!/usr/bin/python3
# SPDX-License-Identifier: WTFPL
"""
Database localization helper tool
Parse enums and sets from sql schema script for translatable strings
"""
import os
import sys
import argparse
import re
__author__ = "Thomas Hooge"
__copyright__ = "Copyright 2026"
__version__ = "0.1"
__email__ = "thomas@hoogi.de"
__status__ = "Development"
COLUMN_RE = re.compile(
r"^\s*(?P<column>\w+)\s+(?P<type>enum|set)\s*"
r"\(\s*(?P<values>'[a-z]+'(?:\s*,\s*'[a-z]+')*)\s*\)",
re.IGNORECASE
)
TABLE_RE = re.compile(
r"CREATE TABLE (?P<table>\w+)",
re.IGNORECASE
)
def load_msgids(sql):
current_table = None
for lineno, line in enumerate(sql.splitlines(), 1):
table_match = TABLE_RE.search(line)
if table_match:
current_table = table_match.group("table")
column_match = COLUMN_RE.search(line)
if current_table and column_match:
column = column_match.group("column")
values = re.findall(
r"'([a-z]+)'",
column_match.group("values"),
)
context = f"{current_table}.{column}"
for value in values:
yield context, value, lineno
def write_pot(msgids, output, filename):
output.write(
'msgid ""\n'
'msgstr ""\n'
'"Content-Type: text/plain; charset=UTF-8\\n"\n'
'"Content-Transfer-Encoding: 8bit\\n"\n'
'"MIME-Version: 1.0\\n"\n'
'\n'
)
for context, msgid, lineno in sorted(set(msgids)):
output.write(f"#: {filename}:{lineno}\n")
output.write(f'msgctxt "{context}"\n')
output.write(f'msgid "{msgid}"\n')
output.write('msgstr ""\n\n')
if __name__ == "__main__":
parser = argparse.ArgumentParser(
description=(
"Database localization helper tool\n"
"Parse enums and sets from SQL schema script "
"for translatable strings"
),
formatter_class=argparse.RawDescriptionHelpFormatter,
)
parser.add_argument(
"sql_file",
help="SQL schema file to parse",
)
parser.add_argument(
"--version",
action="version",
version=f"%(prog)s {__version__}",
)
args = parser.parse_args()
try:
with open(args.sql_file, "r", encoding="utf-8") as f:
sql = f.read()
except OSError as e:
parser.error(str(e))
write_pot(load_msgids(sql), sys.stdout, args.sql_file)
+1
View File
@@ -1 +1,2 @@
/etc/yms/config.inc /usr/share/yms/webgui/config.inc /etc/yms/config.inc /usr/share/yms/webgui/config.inc
/usr/share/yms/icons /usr/lib/yms/icons
+1009 -281
View File
File diff suppressed because it is too large. Load diff
+83 -6
View File
@@ -111,13 +111,19 @@ class Lookup:
'task.priority': ('task', 'priority'), 'task.priority': ('task', 'priority'),
'task.taskstate': ('task', 'taskstate'), 'task.taskstate': ('task', 'taskstate'),
'user.role': ('user', 'role'), 'user.role': ('user', 'role'),
'vessel.vtype': ('vessel', 'vtype') 'vessel.htype': ('vessel', 'htype')
} }
for key, (table, column) in db_enums.items(): for key, (table, column) in db_enums.items():
self._enums[key] = self.db.load_enum(table, column) self._enums[key] = self.db.load_enum(table, column)
def _load_dropdowns(self): def _load_dropdowns(self):
self._dropdowns.clear() self._dropdowns.clear()
sql = "SELECT ddval FROM dropdown WHERE ddid=0 AND ddval>0"
# Step 1: init all lists as empty
self.db.cur.execute(sql)
for ddval in self.db.cur.fetchall():
self._dropdowns[ddval[0]] = {}
# Step 2: fill values where defined
sql = ( sql = (
"SELECT ddid, ddval, ddtext " "SELECT ddid, ddval, ddtext "
"FROM dropdown " "FROM dropdown "
@@ -127,6 +133,8 @@ class Lookup:
self.db.cur.execute(sql) self.db.cur.execute(sql)
for ddid, ddval, ddtext in self.db.cur.fetchall(): for ddid, ddval, ddtext in self.db.cur.fetchall():
if ddid not in self._dropdowns: if ddid not in self._dropdowns:
# should really not happen!
print("unknown dropdown list id found!")
self._dropdowns[ddid] = {} self._dropdowns[ddid] = {}
self._dropdowns[ddid][ddval] = ddtext self._dropdowns[ddid][ddval] = ddtext
@@ -137,12 +145,81 @@ class Lookup:
return self._dropdowns[ddid] return self._dropdowns[ddid]
def user(self): def user(self):
userlist = {} self.db.cur.execute("SELECT userid, displayname FROM user ORDER BY displayname")
sql = "SELECT userid, displayname FROM user ORDER BY displayname" return dict(self.db.cur.fetchall())
self.db.cur.execute(sql)
def vessel(self):
vessellist = {}
self.db.dcur.execute("SELECT vid, vesselname, model FROM vessel ORDER BY vid")
for row in self.db.dcur.fetchall():
vessellist[row['vid']] = (
row['vesselname'] + " - " + row['model'] if row['model']
else row['vesselname']
)
return vessellist
def company(self, comptype):
sql = (
"SELECT compid, compname "
"FROM company "
"WHERE comptype=%(type)s OR comptype2=%(type)s "
"ORDER BY compname"
)
self.db.cur.execute(sql, {"type": comptype})
return dict(self.db.cur.fetchall())
def storage(self, vid):
storagelist = {}
sql = (
"SELECT sid, sname, CONCAT(x, ',', y, ',', z) AS position, remarks "
"FROM storage "
"WHERE vid=%s "
"ORDER BY sname"
)
self.db.cur.execute(sql, (vid,))
for row in self.db.cur.fetchall(): for row in self.db.cur.fetchall():
userlist[row[0]] = row[1] storagelist[row[0]] = "{} ({}) - {}".format(row[1], row[2], row[3])
return userlist return storagelist
def equipment(self, vid):
sql = (
"SELECT eid, ename "
"FROM equipment "
"WHERE vid=%s "
"ORDER BY ename"
)
self.db.cur.execute(sql, (vid,))
return dict(self.db.cur.fetchall())
def inventory(self, vid):
sql = (
"SELECT invid, invname "
"FROM inventory "
"WHERE vid=%s "
"ORDER BY invname"
)
self.db.cur.execute(sql, (vid,))
return dict(self.db.cur.fetchall())
def cable(self, vid):
sql = (
"SELECT cableid, cablename "
"FROM cable "
"WHERE vid=%s "
"ORDER BY cablename"
)
self.db.cur.execute(sql, (vid,))
return dict(self.db.cur.fetchall())
def fuse(self, vid):
sql = (
"SELECT fuseid, CONCAT('F', fnumber, ' - ', description) "
"FROM fuse "
"WHERE vid=%s "
"ORDER BY fnumber"
)
self.db.cur.execute(sql, (vid,))
return dict(self.db.cur.fetchall())
def refresh(self): def refresh(self):
# TODO ugly hack please improve # TODO ugly hack please improve
+4
View File
@@ -145,5 +145,9 @@ class DbRecord:
out = [self._title.format(self.pk_value)] out = [self._title.format(self.pk_value)]
for field in self.fields: for field in self.fields:
value = getattr(self, field, None) value = getattr(self, field, None)
oldvalue = self.data[field]
if value != oldvalue:
out.append(" {:15}: {} ({})".format(field, value, oldvalue))
else:
out.append(" {:15}: {}".format(field, value)) out.append(" {:15}: {}".format(field, value))
return "\n".join(out) return "\n".join(out)