Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

1 files changed, 5 insertions, 8 deletions

diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index e153532c..3460cc65 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -67,11 +67,14 @@ class l10n_client_Core {
     return true;
   }
 
+  /**
+   * @return an array of messages that will be written to the task log
+   */
   static function fetch_updates() {
     $request->locales = array();
     $request->messages = new stdClass();
 
-    $locales = locale::installed();
+    $locales = locales::installed();
     foreach ($locales as $locale => $locale_data) {
       $request->locales[] = $locale;
     }
@@ -101,8 +104,7 @@ class l10n_client_Core {
       throw new Exception("@todo TRANSLATIONS_FETCH_REQUEST_FAILED " . $response_status);
     }
     if (empty($response_data)) {
-      log::info("translations", "Translations fetch request resulted in an empty response");
-      return;
+      return array(t("Translations fetch request resulted in an empty response"));
     }
 
     $response = json_decode($response_data);
@@ -111,11 +113,6 @@ class l10n_client_Core {
     //   [{key:<key_1>, translation: <JSON encoded translation>, rev:<rev>, locale:<locale>},
     //    {key:<key_2>, ...}
     //   ]
-    $count = count($response);
-    log::info("translations",
-              t2("Installed 1 new / updated translation message",
-                 "Installed %count new / updated translation messages", $count));
-
     foreach ($response as $message_data) {
       // @todo Better input validation
       if (empty($message_data->key) || empty($message_data->translation) ||