Attachment 1475630 Details for Bug 1590041 – new patch for translations

[patch] new patch for translations

cppcheck-1.84-translations.patch (text/plain), 1.79 KB, created by Steve Grubb on 2018-08-13 17:38:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Grubb

Created: 2018-08-13 17:38:24 UTC

Size: 1.79 KB

patch

obsolete

>diff -urp cppcheck-1.84.orig/gui/CMakeLists.txt cppcheck-1.84/gui/CMakeLists.txt
>--- cppcheck-1.84.orig/gui/CMakeLists.txt	2018-08-13 13:29:29.082264726 -0400
>+++ cppcheck-1.84/gui/CMakeLists.txt	2018-08-13 13:32:21.181246257 -0400
>@@ -26,7 +26,7 @@ if (BUILD_GUI)
>     target_link_libraries(cppcheck-gui tinyxml2 Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport)
> 
>     install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
>-    install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
>+    install(FILES ${qms} DESTINATION share/${PROJECT_NAME}/lang COMPONENT applications)
> 
>     install(FILES cppcheck-gui.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
> 
>diff -urp cppcheck-1.84.orig/gui/translationhandler.cpp cppcheck-1.84/gui/translationhandler.cpp
>--- cppcheck-1.84.orig/gui/translationhandler.cpp	2018-06-10 16:41:03.000000000 -0400
>+++ cppcheck-1.84/gui/translationhandler.cpp	2018-08-13 13:30:45.279256549 -0400
>@@ -116,15 +116,7 @@ bool TranslationHandler::setLanguage(con
>     if (datadir.isEmpty())
>         datadir = appPath;
> 
>-    QString translationFile;
>-    if (QFile::exists(datadir + "/lang/" + mTranslations[index].mFilename + ".qm"))
>-        translationFile = datadir + "/lang/" + mTranslations[index].mFilename + ".qm";
>-
>-    else if (QFile::exists(datadir + "/" + mTranslations[index].mFilename + ".qm"))
>-        translationFile = datadir + "/" + mTranslations[index].mFilename + ".qm";
>-
>-    else
>-        translationFile = appPath + "/" + mTranslations[index].mFilename + ".qm";
>+    QString translationFile("/usr/share/CppCheck/lang/" + mTranslations[index].mFilename + ".qm");
> 
>     if (!mTranslator->load(translationFile) && !failure) {
>         //If it failed, lets check if the default file exists

Actions: View | Diff

Attachments on bug 1590041: 1475629 | 1475630