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.

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

feat: Add new translations: Bengali, Latvian, Flemish, Vietnamese. #114

Merged
merged 1 commit into from
Nov 21, 2024
Merged

feat: Add new translations: Bengali, Latvian, Flemish, Vietnamese. #114

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
1 change: 1 addition & 0 deletions cmake/Testing.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ auto_test(model sessionchatlog "" "")
auto_test(model exiftransform "" "")
auto_test(model notificationgenerator "" "mock_library")
auto_test(widget filesform "" "")
auto_test(widget/form/settings generalform "" "")

if (UNIX)
auto_test(platform posixsignalnotifier "" "")
Expand Down
115 changes: 62 additions & 53 deletions src/widget/form/settings/generalform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,60 +22,62 @@
#include "src/widget/widget.h"

namespace {
// clang-format off
QStringList locales = {
"ar",
"be",
"ber",
"bg",
"cs",
"da",
"de",
"el",
"en",
"eo",
"es",
"et",
"fa",
"fi",
"fr",
"gl",
"he",
"hr",
"hu",
"is",
"it",
"ja",
"jbo",
"kn",
"ko",
"lt",
"mk",
"nl",
"no_nb",
"pl",
"pr",
"pt",
"pt_BR",
"ro",
"ru",
"si",
"sk",
"sl",
"sq",
"sr",
"sr_Latn",
"sv",
"sw",
"ta",
"tr",
"ug",
"uk",
"ur",
"zh_CN",
"zh_TW"
const QStringList locales = {
"ar", // Arabic
"be", // Belarusian
"ber", // Berber
"bg", // Bulgarian
"bn", // Bengali
"cs", // Czech
"da", // Danish
"de", // German
"el", // Greek
"en", // English
"eo", // Esperanto
"es", // Spanish
"et", // Estonian
"fa", // Persian
"fi", // Finnish
"fr", // French
"gl", // Galician
"he", // Hebrew
"hr", // Croatian
"hu", // Hungarian
"is", // Icelandic
"it", // Italian
"ja", // Japanese
"jbo", // Lojban
"kn", // Kannada
"ko", // Korean
"lt", // Lithuanian
"lv", // Latvian
"mk", // Macedonian
"nl", // Dutch
"nl_BE", // Flemish
"no_nb", // Norwegian Bokmål
"pl", // Polish
"pr", // Pirate
"pt", // Portuguese
"pt_BR", // Brazilian Portuguese
"ro", // Romanian
"ru", // Russian
"si", // Sinhala
"sk", // Slovak
"sl", // Slovenian
"sq", // Albanian
"sr", // Serbian
"sr_Latn", // Serbian (Latin)
"sv", // Swedish
"sw", // Swahili
"ta", // Tamil
"tr", // Turkish
"ug", // Uyghur
"uk", // Ukrainian
"ur", // Urdu
"vi", // Vietnamese
"zh_CN", // Simplified Chinese
"zh_TW", // Traditional Chinese
};
// clang-format on

QFontDatabase::WritingSystem writingSystem(QLocale::Script script)
{
Expand All @@ -88,6 +90,8 @@ QFontDatabase::WritingSystem writingSystem(QLocale::Script script)
return QFontDatabase::WritingSystem::Armenian;
case QLocale::Script::BengaliScript:
return QFontDatabase::WritingSystem::Bengali;
case QLocale::Script::CanadianAboriginalScript:
return QFontDatabase::WritingSystem::Devanagari;
case QLocale::Script::CyrillicScript:
return QFontDatabase::WritingSystem::Cyrillic;
case QLocale::Script::DevanagariScript:
Expand Down Expand Up @@ -143,6 +147,11 @@ QFontDatabase::WritingSystem writingSystem(QLocale::Script script)

} // namespace

const QStringList& GeneralForm::getLocales()
{
return locales;
}

/**
* @class GeneralForm
*
Expand Down
3 changes: 3 additions & 0 deletions src/widget/form/settings/generalform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ class GeneralForm : public GenericForm
{
return tr("General");
}

static const QStringList& getLocales();

signals:
void updateIcons();

Expand Down
38 changes: 25 additions & 13 deletions test/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
load("@rules_cc//cc:defs.bzl", "cc_library")
load("//third_party/qt:build_defs.bzl", "qt_moc", "qt_test")

COPTS = ["-Iqtox"] + select({
"//tools/config:freebsd": [],
"//tools/config:linux": ["-fPIC"],
"//tools/config:osx": [],
"//tools/config:windows": [],
})

qt_moc(
name = "mock_moc",
srcs = ["mock/include/mock/mockcoresettings.h"],
Expand All @@ -15,16 +22,25 @@ qt_moc(
],
)

cc_library(
name = "dbutility",
testonly = True,
srcs = ["dbutility/src/dbutility.cpp"],
hdrs = ["dbutility/include/dbutility/dbutility.h"],
copts = COPTS,
strip_include_prefix = "dbutility/include",
deps = [
"//qtox/src",
"@qt//:qt_core",
"@qt//:qt_test",
],
)

cc_library(
name = "mock",
srcs = [":mock_moc"] + glob(["mock/src/*.cpp"]),
hdrs = glob(["mock/include/mock/*.h"]),
copts = ["-Iqtox"] + select({
"//tools/config:freebsd": [],
"//tools/config:linux": ["-fPIC"],
"//tools/config:osx": [],
"//tools/config:windows": [],
}),
copts = COPTS,
includes = ["mock/include"],
tags = ["no-cross"],
deps = ["//qtox/src"],
Expand All @@ -34,21 +50,17 @@ cc_library(
name = src[src.rindex("/") + 1:-4],
size = "small",
src = src,
copts = ["-Iqtox"] + select({
"//tools/config:freebsd": [],
"//tools/config:linux": ["-fPIC"],
"//tools/config:osx": [],
"//tools/config:windows": [],
}),
copts = COPTS,
mocopts = ["-Iqtox"],
deps = [
":dbutility",
":mock",
"//c-toxcore",
"//qtox:res_lib",
"//qtox/src",
"//qtox/util",
],
) for src in glob(
["*/*_test.cpp"],
["**/*_test.cpp"],
exclude = ["persistence/dbschema_test.cpp"],
)]
43 changes: 43 additions & 0 deletions test/widget/form/settings/generalform_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/* SPDX-License-Identifier: GPL-3.0-or-later
* Copyright © 2024 The TokTok team.
*/

#include "src/widget/form/settings/generalform.h"

#include <QDirIterator>
#include <QTest>

class TestGeneralForm : public QObject
{
Q_OBJECT
private slots:
void testLocales();
};

void TestGeneralForm::testLocales()
{
QDirIterator it(":/translations", QDirIterator::Subdirectories);
QStringList translations;
while (it.hasNext()) {
it.next();
translations << it.fileName();
}
QVERIFY(!translations.isEmpty());

const QStringList locales = GeneralForm::getLocales();
QVERIFY(!locales.isEmpty());

// check if all locales are present in the translations
for (const QString& locale : locales) {
QVERIFY2(translations.contains(locale + ".qm"), qPrintable(locale + ".qm not found"));
}

// check if all translations are present in the locales
for (const QString& translation : translations) {
QVERIFY2(locales.contains(translation.left(translation.size() - 3)),
qPrintable(translation.left(translation.size() - 3) + " not found"));
}
}

QTEST_GUILESS_MAIN(TestGeneralForm)
#include "generalform_test.moc"
9 changes: 9 additions & 0 deletions tools/update-translation-files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# Copyright © 2016 Zetok Zalbavar <zetok@openmailbox.org>
# Copyright © 2019 by The qTox Project Contributors
# Copyright © 2024 The TokTok team.
#
# This file is part of qTox, a Qt-based graphical interface for Tox.
# qTox is libre software: you can redistribute it and/or modify
Expand Down Expand Up @@ -39,3 +40,11 @@ then
else
$LUPDATE_CMD "$@"
fi

echo '<RCC>' >translations/translations.qrc
echo ' <qresource prefix="/translations">' >>translations/translations.qrc
for translation in translations/*.ts; do
echo " <file>$(basename "$translation" .ts).qm</file>" >>translations/translations.qrc
done
echo ' </qresource>' >>translations/translations.qrc
echo '</RCC>' >>translations/translations.qrc
4 changes: 4 additions & 0 deletions translations/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ qt6_add_translation(translations_FILES
ber.ts
be.ts
bg.ts
bn.ts
cs.ts
da.ts
de.ts
Expand All @@ -42,8 +43,10 @@ qt6_add_translation(translations_FILES
kn.ts
ko.ts
lt.ts
lv.ts
mk.ts
nl.ts
nl_BE.ts
no_nb.ts
pl.ts
pr.ts
Expand All @@ -64,6 +67,7 @@ qt6_add_translation(translations_FILES
ug.ts
uk.ts
ur.ts
vi.ts
zh_CN.ts
zh_TW.ts
)
Expand Down
8 changes: 6 additions & 2 deletions translations/translations.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<file>be.qm</file>
<file>ber.qm</file>
<file>bg.qm</file>
<file>bn.qm</file>
<file>cs.qm</file>
<file>da.qm</file>
<file>de.qm</file>
Expand All @@ -26,28 +27,31 @@
<file>kn.qm</file>
<file>ko.qm</file>
<file>lt.qm</file>
<file>lv.qm</file>
<file>mk.qm</file>
<file>nl.qm</file>
<file>nl_BE.qm</file>
<file>no_nb.qm</file>
<file>pl.qm</file>
<file>pr.qm</file>
<file>pt_BR.qm</file>
<file>pt.qm</file>
<file>pt_BR.qm</file>
<file>ro.qm</file>
<file>ru.qm</file>
<file>si.qm</file>
<file>sk.qm</file>
<file>sl.qm</file>
<file>sq.qm</file>
<file>sr_Latn.qm</file>
<file>sr.qm</file>
<file>sr_Latn.qm</file>
<file>sv.qm</file>
<file>sw.qm</file>
<file>ta.qm</file>
<file>tr.qm</file>
<file>ug.qm</file>
<file>uk.qm</file>
<file>ur.qm</file>
<file>vi.qm</file>
<file>zh_CN.qm</file>
<file>zh_TW.qm</file>
</qresource>
Expand Down
Loading