AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix translation on About Page (#618)

Browse source 
Fix About Page
This commit is contained in:
Andrey Zaharow 2024-02-21 16:01:53 +02:00 • committed by GitHub
parent 61abf74b2d
commit 6c0b71bd1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/CMakeLists.txt
View file

@ -15,6 +15,15 @@ set(PACKAGES
Core5Compat Concurrent LinguistTools Core5Compat Concurrent LinguistTools
) )
execute_process(
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
COMMAND git rev-parse --short HEAD
OUTPUT_VARIABLE GIT_COMMIT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}")
if(IOS) if(IOS)
set(PACKAGES ${PACKAGES} Multimedia) set(PACKAGES ${PACKAGES} Multimedia)
endif() endif()

2
client/ui/controllers/settingsController.cpp
View file

@ -28,7 +28,7 @@ SettingsController::SettingsController(const QSharedPointer<ServersModel> &serve
m_sitesModel(sitesModel), m_sitesModel(sitesModel),
m_settings(settings) m_settings(settings)
{ {
m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_VERSION), __DATE__); m_appVersion = QString("%1 (%2, %3)").arg(QString(APP_VERSION), __DATE__, GIT_COMMIT_HASH);
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
if (!m_settings->isScreenshotsEnabled()) { if (!m_settings->isScreenshotsEnabled()) {

2
client/ui/qml/Pages2/PageSettingsAbout.qml
View file

@ -175,7 +175,7 @@ PageType {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: SettingsController.getAppVersion() text: qsTr("Software version: %1").arg(SettingsController.getAppVersion())
color: "#878B91" color: "#878B91"
} }