Merge pull request #330 from selmf/locale

Translations: Don't use QLocale::system::name
This commit is contained in:
Luis Ángel San Martín 2022-10-16 19:08:15 +02:00 committed by GitHub
commit 97790cfca3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 14348 additions and 1954 deletions

View File

@ -196,12 +196,30 @@ TRANSLATIONS = yacreader_es.ts \
yacreader_zh_CN.ts \
yacreader_zh_TW.ts \
yacreader_zh_HK.ts \
yacreader_it.ts
# yacreader_source.ts
yacreader_it.ts \
yacreader_en.ts
LRELEASE_DIR = ../release/languages/
CONFIG += lrelease
win32 {
CONFIG(release, debug|release) {
SOURCE_QM_DIR = $$OUT_PWD/release/*.qm
}
CONFIG(debug, debug|release) {
SOURCE_QM_DIR = $$OUT_PWD/debug/*.qm
}
DEPLOYMENT_OUT_QM_DIR = ../release/languages/
OUT_QM_DIR = $${DESTDIR}/languages/
QMAKE_POST_LINK += $(MKDIR) $$shell_path($${OUT_QM_DIR}) 2> NULL & \
$(COPY) $$shell_path($${SOURCE_QM_DIR}) $$shell_path($${OUT_QM_DIR}) & \
$(MKDIR) $$shell_path($${DEPLOYMENT_OUT_QM_DIR}) 2> NULL & \
$(COPY) $$shell_path($${SOURCE_QM_DIR}) $$shell_path($${DEPLOYMENT_OUT_QM_DIR})
} else {
LRELEASE_DIR = ../release/languages/
}
unix:!macx {
# set install prefix if it's empty
isEmpty(PREFIX) {

View File

@ -173,11 +173,10 @@ int main(int argc, char *argv[])
logger.addDestination(std::move(fileDestination));
QTranslator translator;
QString sufix = QLocale::system().name();
#if defined Q_OS_UNIX && !defined Q_OS_MAC
translator.load(QString(DATADIR) + "/yacreader/languages/yacreader_" + sufix);
translator.load(QLocale(), "yacreader", "_", QString(DATADIR) + "/yacreader/languages");
#else
translator.load(QCoreApplication::applicationDirPath() + "/languages/yacreader_" + sufix);
translator.load(QLocale(), "yacreader", "_", "languages");
#endif
app.installTranslator(&translator);
auto mwv = new MainWindowViewer();

File diff suppressed because it is too large Load Diff

1174
YACReader/yacreader_en.ts Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -124,17 +124,17 @@
<context>
<name>HelpAboutDialog</name>
<message>
<location filename="../custom_widgets/help_about_dialog.cpp" line="25"/>
<location filename="../custom_widgets/help_about_dialog.cpp" line="27"/>
<source>About</source>
<translation></translation>
</message>
<message>
<location filename="../custom_widgets/help_about_dialog.cpp" line="28"/>
<location filename="../custom_widgets/help_about_dialog.cpp" line="30"/>
<source>Help</source>
<translation></translation>
</message>
<message>
<location filename="../custom_widgets/help_about_dialog.cpp" line="31"/>
<location filename="../custom_widgets/help_about_dialog.cpp" line="33"/>
<source>System info</source>
<translation></translation>
</message>
@ -190,112 +190,112 @@
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="64"/>
<location filename="options_dialog.cpp" line="61"/>
<source>Background color</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="67"/>
<location filename="options_dialog.cpp" line="64"/>
<source>Choose</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="100"/>
<location filename="options_dialog.cpp" line="97"/>
<source>Quick Navigation Mode</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="101"/>
<location filename="options_dialog.cpp" line="98"/>
<source>Disable mouse over activation</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="200"/>
<location filename="options_dialog.cpp" line="197"/>
<source>Restart is needed</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="144"/>
<location filename="options_dialog.cpp" line="141"/>
<source>Brightness</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="74"/>
<location filename="options_dialog.cpp" line="71"/>
<source>Scroll behaviour</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="77"/>
<location filename="options_dialog.cpp" line="74"/>
<source>Do not turn page using scroll</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="78"/>
<location filename="options_dialog.cpp" line="75"/>
<source>Use single scroll step to turn page</source>
<translation>使</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="145"/>
<location filename="options_dialog.cpp" line="142"/>
<source>Contrast</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="146"/>
<location filename="options_dialog.cpp" line="143"/>
<source>Gamma</source>
<translation>Gamma值</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="150"/>
<location filename="options_dialog.cpp" line="147"/>
<source>Reset</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="155"/>
<location filename="options_dialog.cpp" line="152"/>
<source>Image options</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="159"/>
<location filename="options_dialog.cpp" line="156"/>
<source>Fit options</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="161"/>
<location filename="options_dialog.cpp" line="158"/>
<source>Enlarge images to fit width/height</source>
<translation>/</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="172"/>
<location filename="options_dialog.cpp" line="169"/>
<source>Double Page options</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="174"/>
<location filename="options_dialog.cpp" line="171"/>
<source>Show covers as single page</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="192"/>
<location filename="options_dialog.cpp" line="189"/>
<source>General</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="193"/>
<location filename="options_dialog.cpp" line="190"/>
<source>Page Flow</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="194"/>
<location filename="options_dialog.cpp" line="191"/>
<source>Image adjustment</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="209"/>
<location filename="options_dialog.cpp" line="206"/>
<source>Options</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="216"/>
<location filename="options_dialog.cpp" line="213"/>
<source>Comics directory</source>
<translation></translation>
</message>
@ -935,7 +935,7 @@
<context>
<name>YACReader::WhatsNewDialog</name>
<message>
<location filename="../custom_widgets/whats_new_dialog.cpp" line="104"/>
<location filename="../custom_widgets/whats_new_dialog.cpp" line="95"/>
<source>Close</source>
<translation></translation>
</message>

View File

@ -124,17 +124,17 @@
<context>
<name>HelpAboutDialog</name>
<message>
<location filename="../custom_widgets/help_about_dialog.cpp" line="25"/>
<location filename="../custom_widgets/help_about_dialog.cpp" line="27"/>
<source>About</source>
<translation></translation>
</message>
<message>
<location filename="../custom_widgets/help_about_dialog.cpp" line="28"/>
<location filename="../custom_widgets/help_about_dialog.cpp" line="30"/>
<source>Help</source>
<translation></translation>
</message>
<message>
<location filename="../custom_widgets/help_about_dialog.cpp" line="31"/>
<location filename="../custom_widgets/help_about_dialog.cpp" line="33"/>
<source>System info</source>
<translation></translation>
</message>
@ -190,112 +190,112 @@
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="64"/>
<location filename="options_dialog.cpp" line="61"/>
<source>Background color</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="67"/>
<location filename="options_dialog.cpp" line="64"/>
<source>Choose</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="100"/>
<location filename="options_dialog.cpp" line="97"/>
<source>Quick Navigation Mode</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="101"/>
<location filename="options_dialog.cpp" line="98"/>
<source>Disable mouse over activation</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="200"/>
<location filename="options_dialog.cpp" line="197"/>
<source>Restart is needed</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="144"/>
<location filename="options_dialog.cpp" line="141"/>
<source>Brightness</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="74"/>
<location filename="options_dialog.cpp" line="71"/>
<source>Scroll behaviour</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="77"/>
<location filename="options_dialog.cpp" line="74"/>
<source>Do not turn page using scroll</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="78"/>
<location filename="options_dialog.cpp" line="75"/>
<source>Use single scroll step to turn page</source>
<translation>使</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="145"/>
<location filename="options_dialog.cpp" line="142"/>
<source>Contrast</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="146"/>
<location filename="options_dialog.cpp" line="143"/>
<source>Gamma</source>
<translation>Gamma值</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="150"/>
<location filename="options_dialog.cpp" line="147"/>
<source>Reset</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="155"/>
<location filename="options_dialog.cpp" line="152"/>
<source>Image options</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="159"/>
<location filename="options_dialog.cpp" line="156"/>
<source>Fit options</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="161"/>
<location filename="options_dialog.cpp" line="158"/>
<source>Enlarge images to fit width/height</source>
<translation>/</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="172"/>
<location filename="options_dialog.cpp" line="169"/>
<source>Double Page options</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="174"/>
<location filename="options_dialog.cpp" line="171"/>
<source>Show covers as single page</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="192"/>
<location filename="options_dialog.cpp" line="189"/>
<source>General</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="193"/>
<location filename="options_dialog.cpp" line="190"/>
<source>Page Flow</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="194"/>
<location filename="options_dialog.cpp" line="191"/>
<source>Image adjustment</source>
<translation>調</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="209"/>
<location filename="options_dialog.cpp" line="206"/>
<source>Options</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="216"/>
<location filename="options_dialog.cpp" line="213"/>
<source>Comics directory</source>
<translation></translation>
</message>
@ -935,7 +935,7 @@
<context>
<name>YACReader::WhatsNewDialog</name>
<message>
<location filename="../custom_widgets/whats_new_dialog.cpp" line="104"/>
<location filename="../custom_widgets/whats_new_dialog.cpp" line="95"/>
<source>Close</source>
<translation></translation>
</message>
@ -1171,4 +1171,4 @@
<translation></translation>
</message>
</context>
</TS>
</TS>

View File

@ -124,17 +124,17 @@
<context>
<name>HelpAboutDialog</name>
<message>
<location filename="../custom_widgets/help_about_dialog.cpp" line="25"/>
<location filename="../custom_widgets/help_about_dialog.cpp" line="27"/>
<source>About</source>
<translation></translation>
</message>
<message>
<location filename="../custom_widgets/help_about_dialog.cpp" line="28"/>
<location filename="../custom_widgets/help_about_dialog.cpp" line="30"/>
<source>Help</source>
<translation></translation>
</message>
<message>
<location filename="../custom_widgets/help_about_dialog.cpp" line="31"/>
<location filename="../custom_widgets/help_about_dialog.cpp" line="33"/>
<source>System info</source>
<translation></translation>
</message>
@ -190,112 +190,112 @@
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="64"/>
<location filename="options_dialog.cpp" line="61"/>
<source>Background color</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="67"/>
<location filename="options_dialog.cpp" line="64"/>
<source>Choose</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="100"/>
<location filename="options_dialog.cpp" line="97"/>
<source>Quick Navigation Mode</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="101"/>
<location filename="options_dialog.cpp" line="98"/>
<source>Disable mouse over activation</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="200"/>
<location filename="options_dialog.cpp" line="197"/>
<source>Restart is needed</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="144"/>
<location filename="options_dialog.cpp" line="141"/>
<source>Brightness</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="74"/>
<location filename="options_dialog.cpp" line="71"/>
<source>Scroll behaviour</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="77"/>
<location filename="options_dialog.cpp" line="74"/>
<source>Do not turn page using scroll</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="78"/>
<location filename="options_dialog.cpp" line="75"/>
<source>Use single scroll step to turn page</source>
<translation>使</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="145"/>
<location filename="options_dialog.cpp" line="142"/>
<source>Contrast</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="146"/>
<location filename="options_dialog.cpp" line="143"/>
<source>Gamma</source>
<translation>Gamma值</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="150"/>
<location filename="options_dialog.cpp" line="147"/>
<source>Reset</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="155"/>
<location filename="options_dialog.cpp" line="152"/>
<source>Image options</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="159"/>
<location filename="options_dialog.cpp" line="156"/>
<source>Fit options</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="161"/>
<location filename="options_dialog.cpp" line="158"/>
<source>Enlarge images to fit width/height</source>
<translation>/</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="172"/>
<location filename="options_dialog.cpp" line="169"/>
<source>Double Page options</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="174"/>
<location filename="options_dialog.cpp" line="171"/>
<source>Show covers as single page</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="192"/>
<location filename="options_dialog.cpp" line="189"/>
<source>General</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="193"/>
<location filename="options_dialog.cpp" line="190"/>
<source>Page Flow</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="194"/>
<location filename="options_dialog.cpp" line="191"/>
<source>Image adjustment</source>
<translation>調</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="209"/>
<location filename="options_dialog.cpp" line="206"/>
<source>Options</source>
<translation></translation>
</message>
<message>
<location filename="options_dialog.cpp" line="216"/>
<location filename="options_dialog.cpp" line="213"/>
<source>Comics directory</source>
<translation></translation>
</message>
@ -935,7 +935,7 @@
<context>
<name>YACReader::WhatsNewDialog</name>
<message>
<location filename="../custom_widgets/whats_new_dialog.cpp" line="104"/>
<location filename="../custom_widgets/whats_new_dialog.cpp" line="95"/>
<source>Close</source>
<translation></translation>
</message>
@ -1171,4 +1171,4 @@
<translation></translation>
</message>
</context>
</TS>
</TS>

View File

@ -285,12 +285,30 @@ TRANSLATIONS = yacreaderlibrary_es.ts \
yacreaderlibrary_zh_CN.ts \
yacreaderlibrary_zh_TW.ts \
yacreaderlibrary_zh_HK.ts \
yacreaderlibrary_it.ts
# yacreaderlibrary_source.ts
yacreaderlibrary_it.ts \
yacreaderlibrary_en.ts
LRELEASE_DIR = ../release/languages/
CONFIG += lrelease
win32 {
CONFIG(release, debug|release) {
SOURCE_QM_DIR = $$OUT_PWD/release/*.qm
}
CONFIG(debug, debug|release) {
SOURCE_QM_DIR = $$OUT_PWD/debug/*.qm
}
DEPLOYMENT_OUT_QM_DIR = ../release/languages/
OUT_QM_DIR = $${DESTDIR}/languages/
QMAKE_POST_LINK += $(MKDIR) $$shell_path($${OUT_QM_DIR}) 2> NULL & \
$(COPY) $$shell_path($${SOURCE_QM_DIR}) $$shell_path($${OUT_QM_DIR}) & \
$(MKDIR) $$shell_path($${DEPLOYMENT_OUT_QM_DIR}) 2> NULL & \
$(COPY) $$shell_path($${SOURCE_QM_DIR}) $$shell_path($${DEPLOYMENT_OUT_QM_DIR})
} else {
LRELEASE_DIR = ../release/languages/
}
#QML/GridView
QT += quick qml quickwidgets

View File

@ -164,21 +164,20 @@ int main(int argc, char **argv)
logger.addDestination(std::move(fileDestination));
QTranslator translator;
QString sufix = QLocale::system().name();
#if defined Q_OS_UNIX && !defined Q_OS_MAC
translator.load(QString(DATADIR) + "/yacreader/languages/yacreaderlibrary_" + sufix);
translator.load(QLocale(), "yacreaderlibrary", "_", QString(DATADIR) + "/yacreader/languages");
#else
translator.load(QCoreApplication::applicationDirPath() + "/languages/yacreaderlibrary_" + sufix);
translator.load(QLocale(), "yacreaderlibrary", "_", "languages");
#endif
app.installTranslator(&translator);
QTranslator viewerTranslator;
#if defined Q_OS_UNIX && !defined Q_OS_MAC
viewerTranslator.load(QString(DATADIR) + "/yacreader/languages/yacreader_" + sufix);
#else
viewerTranslator.load(QCoreApplication::applicationDirPath() + "/languages/yacreader_" + sufix);
#endif
app.installTranslator(&viewerTranslator);
/*QTranslator viewerTranslator;
#if defined Q_OS_UNIX && !defined Q_OS_MAC
viewerTranslator.load(QString(DATADIR) + "/yacreader/languages/yacreader_" + sufix);
#else
viewerTranslator.load(QCoreApplication::applicationDirPath() + "/languages/yacreader_" + sufix);
#endif
app.installTranslator(&viewerTranslator);*/
qRegisterMetaType<ComicDB>("ComicDB");

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -3,7 +3,11 @@
# for a more detailed description, see INSTALL.TXT
CONFIG += c++17
win32:QMAKE_CXXFLAGS += /std:c++17 /Zc:__cplusplus /permissive- #enable c++17 explicitly in msvc
win32 {
#enable c++17 explicitly in msvc
QMAKE_CXXFLAGS += /std:c++17 /Zc:__cplusplus /permissive-
}
DEFINES += NOMINMAX