Incremental fix for ticket #1042: Delete translation from outgoing_translations when the user submits a form with an empty translation.

1 files changed, 21 insertions, 15 deletions

diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index be0aaa11..e3b47681 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -60,25 +60,31 @@ class L10n_Client_Controller extends Controller {
       ->where("locale", "=", $locale)
       ->find();
 
-    if (!$entry->loaded()) {
-      $entry->key = $key;
-      $entry->locale = $locale;
-      $entry->message = $root_message->message;
-      $entry->base_revision = null;
-    }
+    if (empty($translation)) {
+      if ($entry->loaded()) {
+        $entry->delete();
+      }
+    } else {
+      if (!$entry->loaded()) {
+        $entry->key = $key;
+        $entry->locale = $locale;
+        $entry->message = $root_message->message;
+        $entry->base_revision = null;
+      }
 
-    $entry->translation = serialize($translation);
+      $entry->translation = serialize($translation);
 
-    $entry_from_incoming = ORM::factory("incoming_translation")
-      ->where("key", "=", $key)
-      ->where("locale", "=", $locale)
-      ->find();
+      $entry_from_incoming = ORM::factory("incoming_translation")
+        ->where("key", "=", $key)
+        ->where("locale", "=", $locale)
+        ->find();
 
-    if (!$entry_from_incoming->loaded()) {
-      $entry->base_revision = $entry_from_incoming->revision;
-    }
+      if (!$entry_from_incoming->loaded()) {
+        $entry->base_revision = $entry_from_incoming->revision;
+      }
 
-    $entry->save();
+      $entry->save();
+    }
 
     Gallery_I18n::clear_cache($locale);