Unverified Commit 7ed1b2bc authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #244730 from sikmir/crow-translate 

crow-translate: 2.10.5 → 2.10.7
parents 82d35f0c 8dec27a9

pkgs/applications/misc/crow-translate/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ 


stdenv.mkDerivation rec {

  pname = "crow-translate";

  version = "2.10.5";

  version = "2.10.7";



  src = fetchzip {

    url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz";

    hash = "sha256-sAjgG2f0rAWakPd2cZNGXkooIxQQM5OPHm11ahyY1WU=";

    hash = "sha256-OVRl9yQKK3hJgRVV/W4Fl3LxdFpJs01Mo3pwxLg2RXg=";

  };



  patches = [

pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch

+3 −3
Original line number Diff line number Diff line 
diff --git i/src/settings/appsettings.cpp w/src/settings/appsettings.cpp

index a73371b..b9d66ca 100644

index 32cabfb..aab92ea 100644

--- i/src/settings/appsettings.cpp

+++ w/src/settings/appsettings.cpp

@@ -75,7 +75,7 @@ void AppSettings::applyLocale(const QLocale &locale)

@@ -79,7 +79,7 @@ void AppSettings::applyLocale(const QLocale &locale)

     const QLocale newLocale = locale == defaultLocale() ? QLocale::system() : locale;

     QLocale::setDefault(newLocale);

     s_appTranslator.load(newLocale, QStringLiteral(PROJECT_NAME), QStringLiteral("_"), QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("translations"), QStandardPaths::LocateDirectory));

     s_appTranslator.load(newLocale, QStringLiteral(PROJECT_NAME), QStringLiteral("_"), QStandardPaths::locate(QStandardPaths::AppDataLocation, i18nDir, QStandardPaths::LocateDirectory));

-    s_qtTranslator.load(newLocale, QStringLiteral("qt"), QStringLiteral("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath));

+    s_qtTranslator.load(newLocale, QStringLiteral("qt"), QStringLiteral("_"), QLatin1String("@qttranslations@/translations"));

 }