[Pkg-owncloud-commits] [owncloud-client] 58/115: Settings: Display the commit SHA both in branded and unbranded.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 27f9d4523b730cd179b177d4ff831503e35eaa11
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Aug 18 11:24:03 2014 +0200

    Settings: Display the commit SHA both in branded and unbranded.
    
    Also, do not put the developer names into the translation string.
---
 src/mirall/owncloudtheme.cpp | 24 ++++++++----------------
 src/mirall/theme.cpp         | 22 ++++++++++++++++++++--
 src/mirall/theme.h           |  5 +++++
 3 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/mirall/owncloudtheme.cpp b/src/mirall/owncloudtheme.cpp
index be31ff3..8a4da8f 100644
--- a/src/mirall/owncloudtheme.cpp
+++ b/src/mirall/owncloudtheme.cpp
@@ -45,32 +45,24 @@ QString ownCloudTheme::configFileName() const
 QString ownCloudTheme::about() const
 {
     QString devString;
-#ifdef GIT_SHA1
-    const QString githubPrefix(QLatin1String(
-                                   "https://github.com/owncloud/mirall/commit/"));
-    const QString gitSha1(QLatin1String(GIT_SHA1));
-    devString = QCoreApplication::translate("ownCloudTheme::about()",
-                   "<p><small>Built from Git revision <a href=\"%1\">%2</a>"
-                   " on %3, %4 using Qt %5.</small></p>")
-            .arg(githubPrefix+gitSha1).arg(gitSha1.left(6))
-            .arg(__DATE__).arg(__TIME__)
-            .arg(QT_VERSION_STR);
-#endif
-    return  QCoreApplication::translate("ownCloudTheme::about()",
+    const QString names("Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz");
+    devString = QCoreApplication::translate("ownCloudTheme::about() - please leave _OCDEVS_NAMES_ untouched",
                "<p>Version %2. "
                "For more information visit <a href=\"%3\">%4</a></p>"
-               "<p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>"
+               "<p><small>By _OCDEVS_NAMES_ and others.<br/>"
                "Based on Mirall by Duncan Mac-Vicar P.</small></p>"
                "<p>Copyright ownCloud, Inc.</p>"
                "<p>Licensed under the GNU Public License (GPL) Version 2.0<br/>"
                "ownCloud and the ownCloud Logo are registered trademarks of ownCloud, "
                "Inc. in the United States, other countries, or both</p>"
-               "%7"
                )
             .arg(MIRALL_VERSION_STRING)
             .arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN))
-            .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN))
-            .arg(devString);
+            .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN));
+
+    devString.replace("_OCDEVS_NAMES_", names);
+    devString += gitSHA1();
+    return devString;
 
 }
 
diff --git a/src/mirall/theme.cpp b/src/mirall/theme.cpp
index 06bfeb6..d6f3321 100644
--- a/src/mirall/theme.cpp
+++ b/src/mirall/theme.cpp
@@ -211,15 +211,33 @@ QString Theme::updateCheckUrl() const
     return QLatin1String("https://updates.owncloud.com/client/");
 }
 
+QString Theme::gitSHA1() const
+{
+    QString devString;
+#ifdef GIT_SHA1
+    const QString githubPrefix(QLatin1String(
+                                   "https://github.com/owncloud/mirall/commit/"));
+    const QString gitSha1(QLatin1String(GIT_SHA1));
+    devString = QCoreApplication::translate("ownCloudTheme::about()",
+                   "<p><small>Built from Git revision <a href=\"%1\">%2</a>"
+                   " on %3, %4 using Qt %5.</small></p>")
+            .arg(githubPrefix+gitSha1).arg(gitSha1.left(6))
+            .arg(__DATE__).arg(__TIME__)
+            .arg(QT_VERSION_STR);
+#endif
+    return devString;
+}
+
 QString Theme::about() const
 {
     return tr("<p>Version %1 For more information please visit <a href='%2'>%3</a>.</p>"
               "<p>Copyright ownCloud, Inc.</p>"
-              "<p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>"
+              "<p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>"
               "%5 and the %5 logo are registered trademarks of %4 in the "
               "United States, other countries, or both.</p>")
             .arg(MIRALL_VERSION_STRING).arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN))
-            .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)).arg(APPLICATION_VENDOR).arg(APPLICATION_NAME);
+            .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)).arg(APPLICATION_VENDOR).arg(APPLICATION_NAME)
+            +gitSHA1();
 }
 
 #ifndef TOKEN_AUTH_ONLY
diff --git a/src/mirall/theme.h b/src/mirall/theme.h
index 3c1d69c..e04e25a 100644
--- a/src/mirall/theme.h
+++ b/src/mirall/theme.h
@@ -161,6 +161,11 @@ public:
 #endif
 
     /**
+     * The SHA sum of the released git commit
+     */
+    QString gitSHA1() const;
+
+    /**
      * About dialog contents
      */
     virtual QString about() const;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git