mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 17:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #452 from nextcloud/organize-windows-translation

Browse source 
Windows: moves translation files to /i18n.
This commit is contained in:
Roeland Jago Douma 2018-06-27 13:14:19 +02:00 committed by GitHub
commit 5ce9aedb7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gui/CMakeLists.txt
View file

@ -264,9 +264,10 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
string(REPLACE "-${APPLICATION_ICON_NAME}-icon.png" "" _res ${_res})
install(FILES ${_file} RENAME ${APPLICATION_ICON_NAME}.png DESTINATION ${DATADIR}/icons/hicolor/${_res}x${_res}/apps)
endforeach(_file)
endif(NOT WIN32)
install(FILES ${client_I18N} DESTINATION ${SHAREDIR}/${APPLICATION_EXECUTABLE}/i18n)
install(FILES ${client_I18N} DESTINATION ${SHAREDIR}/${APPLICATION_EXECUTABLE}/i18n)
else()
install(FILES ${client_I18N} DESTINATION i18n)
endif()
# we may not add MACOSX_BUNDLE here, if not building one

2
src/gui/application.cpp
View file

@ -83,7 +83,7 @@ namespace {
return devTrPath;
}
#if defined(Q_OS_WIN)
return QApplication::applicationDirPath();
return QApplication::applicationDirPath() + QLatin1String("/i18n/");
#elif defined(Q_OS_MAC)
return QApplication::applicationDirPath() + QLatin1String("/../Resources/Translations"); // path defaults to app dir.
#elif defined(Q_OS_UNIX)