From: Thomas Mudrunka Date: Mon, 19 Mar 2012 11:21:11 +0000 (+0100) Subject: Grammar nazi attack X-Git-Url: https://git.harvie.cz/?a=commitdiff_plain;h=3b62698949ec9f94f06f0f7c7fe46a7ba59c9992;p=mirrors%2FSokoMan.git Grammar nazi attack --- diff --git a/index.php b/index.php index 6ea6551..07937b0 100755 --- a/index.php +++ b/index.php @@ -370,8 +370,8 @@ EOF; ); $relations_conditions=array( 'in_stock' => 'return(@$table[$id]["status_name"] == "stored");', - 'not_sold' => 'return(@$table[$id]["status_name"] != "saled");', - 'not_sold_or_disposed' => 'return(@$table[$id]["status_name"] != "saled" && @$table[$id]["status_name"] != "disposed");' + 'not_sold' => 'return(@$table[$id]["status_name"] != "sold");', + 'not_sold_or_disposed' => 'return(@$table[$id]["status_name"] != "sold" && @$table[$id]["status_name"] != "disposed");' ); foreach($table as $id => $row) { foreach($row as $column => $value) { diff --git a/install.sql b/install.sql index 6cdbf7a..aff3558 100644 --- a/install.sql +++ b/install.sql @@ -140,7 +140,7 @@ CREATE TABLE `status` ( LOCK TABLES `status` WRITE; /*!40000 ALTER TABLE `status` DISABLE KEYS */; -INSERT INTO `status` VALUES (0,'deleted'),(4,'destroyed'),(2,'placed'),(3,'saled'),(1,'stored'); +INSERT INTO `status` VALUES (0,'deleted'),(4,'destroyed'),(2,'placed'),(3,'sold'),(1,'stored'); /*!40000 ALTER TABLE `status` ENABLE KEYS */; UNLOCK TABLES; @@ -202,7 +202,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2011-12-06 15:26:19 +-- Dump completed on 2012-03-19 12:20:46 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -242,7 +242,7 @@ CREATE TABLE `item` ( CONSTRAINT `item_ibfk_7` FOREIGN KEY (`model_id`) REFERENCES `model` (`model_id`), CONSTRAINT `item_ibfk_8` FOREIGN KEY (`status_id`) REFERENCES `status` (`status_id`), CONSTRAINT `item_ibfk_9` FOREIGN KEY (`room_id`) REFERENCES `room` (`room_id`) -) ENGINE=InnoDB AUTO_INCREMENT=38 DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci; +) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `model`; /*!40101 SET @saved_cs_client = @@character_set_client */; diff --git a/locale/cs/messages.inc.php b/locale/cs/messages.inc.php index f37d630..a5f05ea 100644 --- a/locale/cs/messages.inc.php +++ b/locale/cs/messages.inc.php @@ -70,7 +70,7 @@ $LOCALE_MESSAGES = array( 'deleted' => 'smazáno', 'stored' => 'skladem', 'placed' => 've firmě', - 'saled' => 'prodáno', + 'sold' => 'prodáno', 'destroyed' => 'zníčeno/ztraceno', '0000-00-00 00:00:00' => 'aktuální',