From ff6791f57652aecfe5d3b43848b0a63f4307fa35 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 13 Jan 2009 01:05:11 +0000
Subject: Models should be named in adjective_noun form to make pluralizatoin
 more intuitive.

Renamed Translations_Incoming to Incoming_Translation to suit.
---
 core/helpers/core_installer.php       |  4 ++--
 core/libraries/I18n.php               |  2 +-
 core/models/incoming_translation.php  | 21 +++++++++++++++++++++
 core/models/translations_incoming.php | 21 ---------------------
 core/tests/I18n_Test.php              |  4 ++--
 5 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 core/models/incoming_translation.php
 delete mode 100644 core/models/translations_incoming.php

diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php
index ff5def5f..c45c497c 100644
--- a/core/helpers/core_installer.php
+++ b/core/helpers/core_installer.php
@@ -128,7 +128,7 @@ class core_installer {
                    UNIQUE KEY(`name`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
-      $db->query("CREATE TABLE `translations_incomings` (
+      $db->query("CREATE TABLE `incoming_translations` (
                    `id` int(9) NOT NULL auto_increment,
                    `key` binary(16) NOT NULL,
                    `locale` char(10) NOT NULL,
@@ -256,7 +256,7 @@ class core_installer {
     $db->query("DROP TABLE IF EXISTS `messages`;");
     $db->query("DROP TABLE IF EXISTS `modules`;");
     $db->query("DROP TABLE IF EXISTS `themes`;");
-    $db->query("DROP TABLE IF EXISTS `translations_incoming`;");
+    $db->query("DROP TABLE IF EXISTS `incoming_translations`;");
     $db->query("DROP TABLE IF EXISTS `permissions`;");
     $db->query("DROP TABLE IF EXISTS `sessions`;");
     $db->query("DROP TABLE IF EXISTS `tasks`;");
diff --git a/core/libraries/I18n.php b/core/libraries/I18n.php
index 6a8bf3ed..2007bb07 100644
--- a/core/libraries/I18n.php
+++ b/core/libraries/I18n.php
@@ -80,7 +80,7 @@ class I18n_Core {
     $key = is_array($message) ? array_shift($message) : $message;
     $entry = Database::instance()
         ->select("translation")
-        ->from("translations_incomings")
+        ->from("incoming_translations")
         ->where(array("key" => md5($key, true),
                       "locale" => $locale))
         ->limit(1)
diff --git a/core/models/incoming_translation.php b/core/models/incoming_translation.php
new file mode 100644
index 00000000..fcd79cd4
--- /dev/null
+++ b/core/models/incoming_translation.php
@@ -0,0 +1,21 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Incoming_Translation_Model extends ORM {
+}
diff --git a/core/models/translations_incoming.php b/core/models/translations_incoming.php
deleted file mode 100644
index f4b0a9ac..00000000
--- a/core/models/translations_incoming.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class Translations_Incoming_Model extends ORM {
-}
diff --git a/core/tests/I18n_Test.php b/core/tests/I18n_Test.php
index 5d505eb1..f99dd9c1 100644
--- a/core/tests/I18n_Test.php
+++ b/core/tests/I18n_Test.php
@@ -29,7 +29,7 @@ class I18n_Test extends Unit_Test_Case {
     $this->i18n = I18n::instance($config);
 
     $db = Database::instance();
-    $db->query("DELETE FROM `translations_incomings` WHERE `locale` = 'te_ST'");
+    $db->query("DELETE FROM `incoming_translations` WHERE `locale` = 'te_ST'");
 
     $messages_de_DE = array(
         array('Hello world', 'Hallo Welt'),
@@ -43,7 +43,7 @@ class I18n_Test extends Unit_Test_Case {
       list ($message, $translation) = $data;
       $key = $message;
       $key = is_array($key) ? array_shift($key) : $key;
-      $entry = ORM::factory("translations_incoming");
+      $entry = ORM::factory("incoming_translation");
       $entry->key = md5($key, true);
       $entry->message = serialize($message);
       $entry->translation = serialize($translation);
-- 
cgit v1.2.3