From 18ae2acd723a5217057c207050ad1cc001755544 Mon Sep 17 00:00:00 2001 From: Yusuke Muraoka <yusuke@nexedi.com> Date: Fri, 2 Apr 2010 03:04:07 +0000 Subject: [PATCH] 2010-04-02 yusuke * Fixed the column name conflict. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34257 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../z_catalog_content_translation_list.xml | 4 ++-- .../z_create_content_translation.xml | 8 ++++---- ...CatalogTool_getContentTranslationDictList.xml | 16 ++++++++-------- bt5/erp5_content_translation/bt/change_log | 3 +++ bt5/erp5_content_translation/bt/revision | 2 +- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_content_translation_list.xml b/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_content_translation_list.xml index ac371b4097..4ca43ecbe8 100644 --- a/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_content_translation_list.xml +++ b/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_content_translation_list.xml @@ -68,7 +68,7 @@ VALUES\n <dtml-in "content_translation_dict_list">\n (<dtml-sqlvar "_[\'sequence-item\'][\'uid\']" type=int>,\n <dtml-sqlvar "_[\'sequence-item\'][\'property_name\']" type=string>,\n - <dtml-sqlvar "_[\'sequence-item\'][\'language\']" type=string>,\n + <dtml-sqlvar "_[\'sequence-item\'][\'content_language\']" type=string>,\n <dtml-sqlvar "_[\'sequence-item\'][\'translated_text\']" type=string>\n )\n <dtml-unless sequence-end>,</dtml-unless>\n @@ -122,7 +122,7 @@ VALUES\n <dtml-in "content_translation_dict_list">\n (<dtml-sqlvar "_[\'sequence-item\'][\'uid\']" type=int>,\n <dtml-sqlvar "_[\'sequence-item\'][\'property_name\']" type=string>,\n - <dtml-sqlvar "_[\'sequence-item\'][\'language\']" type=string>,\n + <dtml-sqlvar "_[\'sequence-item\'][\'content_language\']" type=string>,\n <dtml-sqlvar "_[\'sequence-item\'][\'translated_text\']" type=string>\n )\n <dtml-unless sequence-end>,</dtml-unless>\n diff --git a/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_content_translation.xml b/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_content_translation.xml index 3aa04ddc24..1fde37742e 100644 --- a/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_content_translation.xml +++ b/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_content_translation.xml @@ -91,9 +91,9 @@ <value> <string>CREATE TABLE `content_translation` (\n `uid` BIGINT UNSIGNED NOT NULL,\n `property_name` VARCHAR(100),\n - `language` VARCHAR(100),\n + `content_language` VARCHAR(100),\n `translated_text` TEXT,\n - PRIMARY KEY (`uid`, `property_name`, `language`),\n + PRIMARY KEY (`uid`, `property_name`, `content_language`),\n FULLTEXT `Translated Text` (`translated_text`)\n ) TYPE=MyISAM;\n </string> </value> @@ -135,9 +135,9 @@ <value> <string>CREATE TABLE `content_translation` (\n `uid` BIGINT UNSIGNED NOT NULL,\n `property_name` VARCHAR(100),\n - `language` VARCHAR(100),\n + `content_language` VARCHAR(100),\n `translated_text` TEXT,\n - PRIMARY KEY (`uid`, `property_name`, `language`),\n + PRIMARY KEY (`uid`, `property_name`, `content_language`),\n FULLTEXT `Translated Text` (`translated_text`)\n ) TYPE=MyISAM;\n </string> </value> diff --git a/bt5/erp5_content_translation/SkinTemplateItem/portal_skins/erp5_content_translation/CatalogTool_getContentTranslationDictList.xml b/bt5/erp5_content_translation/SkinTemplateItem/portal_skins/erp5_content_translation/CatalogTool_getContentTranslationDictList.xml index e97e740f7d..89e694550c 100644 --- a/bt5/erp5_content_translation/SkinTemplateItem/portal_skins/erp5_content_translation/CatalogTool_getContentTranslationDictList.xml +++ b/bt5/erp5_content_translation/SkinTemplateItem/portal_skins/erp5_content_translation/CatalogTool_getContentTranslationDictList.xml @@ -69,7 +69,7 @@ result = []\n def upperCase(text):\n return convertToUpperCase(text.replace(\'-\', \'_\'))\n \n -language_list = context.Localizer.get_languages()\n +content_language_list = context.Localizer.get_languages()\n \n for document in document_list:\n if document.getPortalType() not in portal_type_list:\n @@ -83,9 +83,9 @@ for document in document_list:\n if original_method is not None:\n original_text = original_method()\n \n - for language in language_list:\n + for content_language in content_language_list:\n method_name = \'get%s\' % (upperCase(\'%s_translated_%s\' %\n - (language, property_name)),)\n + (content_language, property_name)),)\n translated_text = None\n method = getattr(document, method_name, None)\n if method is not None and document.getProperty(\'%s_translation_domain\' % property_name) == \'content\':\n @@ -93,20 +93,20 @@ for document in document_list:\n else:\n translation_method = getattr(document, \'get%s\' % upperCase(\'translated_%s\' % property_name), None)\n if original_text is not None and translation_method is not None:\n - temporary_translated_text = translation_method(language=language)\n + temporary_translated_text = translation_method(language=content_language)\n if original_text != temporary_translated_text:\n translated_text = temporary_translated_text\n if translated_text:\n temporary_result.append({\'uid\': uid,\n \'property_name\': property_name,\n - \'language\': language,\n + \'content_language\': content_language,\n \'translated_text\': translated_text,\n })\n # also add original content\n if original_text is not None:\n temporary_result.append({\'uid\': uid,\n \'property_name\': property_name,\n - \'language\': \'\',\n + \'content_language\': \'\',\n \'translated_text\': original_text,\n })\n result.extend(temporary_result)\n @@ -156,7 +156,7 @@ return result\n <string>upperCase</string> <string>_getattr_</string> <string>context</string> - <string>language_list</string> + <string>content_language_list</string> <string>_getiter_</string> <string>document</string> <string>uid</string> @@ -166,7 +166,7 @@ return result\n <string>original_text</string> <string>getattr</string> <string>original_method</string> - <string>language</string> + <string>content_language</string> <string>method_name</string> <string>translated_text</string> <string>method</string> diff --git a/bt5/erp5_content_translation/bt/change_log b/bt5/erp5_content_translation/bt/change_log index f50314e72a..e096d8cc27 100644 --- a/bt5/erp5_content_translation/bt/change_log +++ b/bt5/erp5_content_translation/bt/change_log @@ -1,3 +1,6 @@ +2010-04-02 yusuke +* Fixed the column name conflict. + 2010-03-03 yusuke * Use sql_deferred_connection instead of sql_connection diff --git a/bt5/erp5_content_translation/bt/revision b/bt5/erp5_content_translation/bt/revision index a5c750feac..d99e90eb96 100644 --- a/bt5/erp5_content_translation/bt/revision +++ b/bt5/erp5_content_translation/bt/revision @@ -1 +1 @@ -27 \ No newline at end of file +29 \ No newline at end of file -- 2.30.9