From 1a3062f2f9d8d845b06d819a6623ec333f606593 Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Mon, 14 Jul 2014 10:35:50 +0000
Subject: [PATCH] Use more convenient name for the primary key in "translation"
 table

---
 src/mibew/configs/database_schema.yml                         | 2 +-
 .../Mibew/Controller/Localization/TranslationController.php   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mibew/configs/database_schema.yml b/src/mibew/configs/database_schema.yml
index 0b47da27..15a9de01 100644
--- a/src/mibew/configs/database_schema.yml
+++ b/src/mibew/configs/database_schema.yml
@@ -112,7 +112,7 @@ requestcallback:
 # Contains updated translations
 translation:
     fields:
-        stringid: "int NOT NULL auto_increment PRIMARY KEY"
+        translationid: "int NOT NULL auto_increment PRIMARY KEY"
         locale: "varchar(5) NOT NULL"
         context: "varchar(256) NOT NULL DEFAULT ''"
         source: "text COLLATE utf8_bin"
diff --git a/src/mibew/libs/classes/Mibew/Controller/Localization/TranslationController.php b/src/mibew/libs/classes/Mibew/Controller/Localization/TranslationController.php
index 4234f561..931592f0 100644
--- a/src/mibew/libs/classes/Mibew/Controller/Localization/TranslationController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/Localization/TranslationController.php
@@ -60,7 +60,7 @@ class TranslationController extends AbstractController
         $strings = $this->loadStrings($target);
         foreach ($strings as $key => $item) {
             $strings[$key] = array(
-                'id' => $item['stringid'],
+                'id' => $item['translationid'],
                 'source' => htmlentities($item['source']),
                 'translation' => (empty($item['translation'])
                     ? "<font color=\"#c13030\"><b>absent</b></font>"
@@ -229,7 +229,7 @@ class TranslationController extends AbstractController
     protected function loadString($id)
     {
         $string = Database::getInstance()->query(
-            "SELECT * FROM {translation} WHERE stringid = :id",
+            "SELECT * FROM {translation} WHERE translationid = :id",
             array(':id' => $id),
             array('return_rows' => Database::RETURN_ONE_ROW)
         );