diff options
20 files changed, 159 insertions, 79 deletions
diff --git a/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-error.po b/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-error.po index 254a3c3..584ebaf 100644 --- a/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-error.po +++ b/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-error.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: oslo.db\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:14+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: 2015-03-19 19:04+0000\n" "Last-Translator: Andi Chandler <andi@gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/" @@ -17,7 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "'eventlet' is required for TpoolDbapiWrapper." diff --git a/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-info.po b/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-info.po index a5a8385..b63fa12 100644 --- a/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-info.po +++ b/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-info.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: oslo.db\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:14+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: 2014-11-26 13:04+0000\n" "Last-Translator: Andi Chandler <andi@gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/" @@ -17,7 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #, python-format diff --git a/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-warning.po b/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-warning.po index 5a3b8c4..a329fbf 100644 --- a/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-warning.po +++ b/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-warning.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: oslo.db\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:14+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: 2015-03-19 19:04+0000\n" "Last-Translator: Andi Chandler <andi@gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/" @@ -17,7 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Id not in sort_keys; is sort_keys unique?" diff --git a/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db.po b/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db.po index 88fb668..b1f9926 100644 --- a/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db.po +++ b/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: oslo.db\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:14+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: 2014-09-02 09:18+0000\n" "Last-Translator: Andi Chandler <andi@gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/" @@ -17,7 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" msgid "Invalid Parameter: Encoding directive wasn't provided." msgstr "Invalid Parameter: Encoding directive wasn't provided." diff --git a/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-error.po b/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-error.po index 91f8aca..6043104 100644 --- a/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-error.po +++ b/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-error.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: oslo.db\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:14+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: 2015-06-22 21:08+0000\n" "Last-Translator: Adriana Chisco Landazábal <achisco94@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/oslodb/language/" @@ -17,7 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "'eventlet' is required for TpoolDbapiWrapper." diff --git a/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-info.po b/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-info.po index 945e5ed..e8d427a 100644 --- a/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-info.po +++ b/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-info.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: oslo.db\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:14+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: 2015-06-22 21:10+0000\n" "Last-Translator: Adriana Chisco Landazábal <achisco94@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/oslodb/language/" @@ -17,7 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #, python-format diff --git a/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-warning.po b/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-warning.po index 14a3586..d7560d3 100644 --- a/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-warning.po +++ b/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-warning.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: oslo.db\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:14+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: 2015-06-22 21:13+0000\n" "Last-Translator: Adriana Chisco Landazábal <achisco94@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/oslodb/language/" @@ -17,7 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Id not in sort_keys; is sort_keys unique?" diff --git a/oslo.db/locale/es/LC_MESSAGES/oslo.db.po b/oslo.db/locale/es/LC_MESSAGES/oslo.db.po index 0ac9b5c..82cc683 100644 --- a/oslo.db/locale/es/LC_MESSAGES/oslo.db.po +++ b/oslo.db/locale/es/LC_MESSAGES/oslo.db.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: oslo.db\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:14+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: 2015-06-22 21:21+0000\n" "Last-Translator: Adriana Chisco Landazábal <achisco94@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/oslodb/language/" @@ -17,7 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" msgid "Invalid Parameter: Encoding directive wasn't provided." msgstr "Parámetro no válido: No se proporcionó directiva de codificación." diff --git a/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-error.po b/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-error.po index fb6cef6..4e3adca 100644 --- a/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-error.po +++ b/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-error.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: oslo.db\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:14+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: 2015-02-18 02:50+0000\n" "Last-Translator: Maxime COQUEREL <max.coquerel@gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/oslodb/language/" @@ -17,7 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" msgid "'eventlet' is required for TpoolDbapiWrapper." diff --git a/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-info.po b/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-info.po index a5422dd..9130deb 100644 --- a/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-info.po +++ b/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-info.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: oslo.db\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:14+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: 2014-11-23 18:38+0000\n" "Last-Translator: Maxime COQUEREL <max.coquerel@gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/oslodb/language/" @@ -17,7 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #, python-format diff --git a/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-warning.po b/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-warning.po index 5a059bd..c88df94 100644 --- a/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-warning.po +++ b/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-warning.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: oslo.db\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:14+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: 2015-03-15 14:48+0000\n" "Last-Translator: openstackjenkins <jenkins@openstack.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/oslodb/language/" @@ -17,7 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" msgid "Id not in sort_keys; is sort_keys unique?" diff --git a/oslo.db/locale/fr/LC_MESSAGES/oslo.db.po b/oslo.db/locale/fr/LC_MESSAGES/oslo.db.po new file mode 100644 index 0000000..4da7424 --- /dev/null +++ b/oslo.db/locale/fr/LC_MESSAGES/oslo.db.po @@ -0,0 +1,74 @@ +# French translations for oslo.db. +# Copyright (C) 2015 ORGANIZATION +# This file is distributed under the same license as the oslo.db project. +# +# Translators: +# Maxime COQUEREL <max.coquerel@gmail.com>, 2014-2015 +msgid "" +msgstr "" +"Project-Id-Version: oslo.db\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" +"PO-Revision-Date: 2015-07-28 21:03+0000\n" +"Last-Translator: Maxime COQUEREL <max.coquerel@gmail.com>\n" +"Language-Team: French (http://www.transifex.com/projects/p/oslodb/language/" +"fr/)\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.0\n" + +msgid "Invalid Parameter: Encoding directive wasn't provided." +msgstr "Paramètre non valide : La directive encodage n'a pas été fourni." + +#, python-format +msgid "" +"Please specify column %s in col_name_col_instance param. It is required " +"because column has unsupported type by SQLite." +msgstr "" +"Spécifiez la colonne %s dans le paramètre col_name_col_instance. Ceci est " +"obligatoire car la colonne a un type non pris en charge dans SQLite." + +msgid "Sort key supplied was not valid." +msgstr "La clé de tri fournie n'était pas valide." + +#, python-format +msgid "" +"Tables \"%s\" have non utf8 collation, please make sure all tables are " +"CHARSET=utf8" +msgstr "" +"Les tables \"%s\" ont une collation non utf8, assurez-vous que pour toutes " +"les tables CHARSET=utf8." + +msgid "" +"The database is not under version control, but has tables. Please stamp the " +"current version of the schema manually." +msgstr "" +"La base de données n'est pas versionnée, mais contient des tables. Veuillez " +"indiquer manuellement la version courante du schéma." + +#, python-format +msgid "There is no `project_id` column in `%s` table." +msgstr "Il n'y a pas de colonne `project_id` dans la table `%s`." + +msgid "Unknown sort direction, must be 'desc' or 'asc'" +msgstr "Direction d'ordonnancement inconnue, choisir 'desc' ou 'asc'" + +msgid "Unsupported id columns type" +msgstr "Type de colonnes id non pris en charge" + +#, python-format +msgid "" +"col_name_col_instance param has wrong type of column instance for column %s " +"It should be instance of sqlalchemy.Column." +msgstr "" +"Le paramètre col_name_col_instance contient un type d'instance de colonne " +"incorrect pour la colonne %s. Il devrait être une instance de sqlalchemy." +"Column." + +msgid "model should be a subclass of ModelBase" +msgstr "model doit etre une sous-classe de ModelBase" + +msgid "version should be an integer" +msgstr "version doit être un entier" diff --git a/oslo.db/locale/oslo.db-log-critical.pot b/oslo.db/locale/oslo.db-log-critical.pot index 819c9f7..b2ca181 100644 --- a/oslo.db/locale/oslo.db-log-critical.pot +++ b/oslo.db/locale/oslo.db-log-critical.pot @@ -1,19 +1,19 @@ # Translations template for oslo.db. -# Copyright (C) 2014 ORGANIZATION +# Copyright (C) 2015 ORGANIZATION # This file is distributed under the same license as the oslo.db project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2014. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2015. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.db 0.3.0.1.g4796d06\n" +"Project-Id-Version: oslo.db 2.2.1.dev2\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-07-14 06:03+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" diff --git a/oslo.db/locale/oslo.db-log-error.pot b/oslo.db/locale/oslo.db-log-error.pot index 85a4617..08302f6 100644 --- a/oslo.db/locale/oslo.db-log-error.pot +++ b/oslo.db/locale/oslo.db-log-error.pot @@ -6,22 +6,22 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.db 1.4.1.post9\n" +"Project-Id-Version: oslo.db 2.2.1.dev2\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-30 06:20+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" -#: oslo_db/api.py:120 +#: oslo_db/api.py:142 msgid "DB exceeded retry limit." msgstr "" -#: oslo_db/api.py:124 +#: oslo_db/api.py:166 msgid "DB error." msgstr "" @@ -29,21 +29,21 @@ msgstr "" msgid "'eventlet' is required for TpoolDbapiWrapper." msgstr "" -#: oslo_db/sqlalchemy/exc_filters.py:292 +#: oslo_db/sqlalchemy/exc_filters.py:328 #, python-format msgid "DBAPIError exception wrapped from %s" msgstr "" -#: oslo_db/sqlalchemy/exc_filters.py:303 +#: oslo_db/sqlalchemy/exc_filters.py:339 msgid "DB exception wrapped." msgstr "" -#: oslo_db/sqlalchemy/test_migrations.py:272 +#: oslo_db/sqlalchemy/test_migrations.py:271 #, python-format msgid "Failed to migrate to version %(ver)s on engine %(eng)s" msgstr "" -#: oslo_db/sqlalchemy/migration_cli/ext_migrate.py:61 +#: oslo_db/sqlalchemy/migration_cli/ext_migrate.py:59 msgid "" "Migration number for migrate plugin must be valid integer or empty, if " "you want to downgrade to initial state" diff --git a/oslo.db/locale/oslo.db-log-info.pot b/oslo.db/locale/oslo.db-log-info.pot index aee920a..7788460 100644 --- a/oslo.db/locale/oslo.db-log-info.pot +++ b/oslo.db/locale/oslo.db-log-info.pot @@ -1,28 +1,28 @@ # Translations template for oslo.db. -# Copyright (C) 2014 ORGANIZATION +# Copyright (C) 2015 ORGANIZATION # This file is distributed under the same license as the oslo.db project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2014. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2015. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.db 1.0.1.49.g04235f9\n" +"Project-Id-Version: oslo.db 2.2.1.dev2\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-10 06:02+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" -#: oslo/db/sqlalchemy/provision.py:151 oslo/db/sqlalchemy/provision.py:162 +#: oslo_db/sqlalchemy/provision.py:221 oslo_db/sqlalchemy/provision.py:232 #, python-format msgid "The %(dbapi)s backend is unavailable: %(err)s" msgstr "" -#: oslo/db/sqlalchemy/utils.py:415 +#: oslo_db/sqlalchemy/utils.py:427 #, python-format msgid "Deleting duplicated row with id: %(id)s from table: %(table)s" msgstr "" diff --git a/oslo.db/locale/oslo.db-log-warning.pot b/oslo.db/locale/oslo.db-log-warning.pot index 34ea803..089785d 100644 --- a/oslo.db/locale/oslo.db-log-warning.pot +++ b/oslo.db/locale/oslo.db-log-warning.pot @@ -6,39 +6,39 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.db 1.7.0.post3\n" +"Project-Id-Version: oslo.db 2.2.1.dev2\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-03-19 06:01+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" -#: oslo_db/sqlalchemy/session.py:510 +#: oslo_db/sqlalchemy/engines.py:250 msgid "Unable to detect effective SQL mode" msgstr "" -#: oslo_db/sqlalchemy/session.py:517 +#: oslo_db/sqlalchemy/engines.py:257 #, python-format msgid "MySQL SQL mode is '%s', consider enabling TRADITIONAL or STRICT_ALL_TABLES" msgstr "" -#: oslo_db/sqlalchemy/session.py:585 +#: oslo_db/sqlalchemy/engines.py:325 #, python-format msgid "SQL connection failed. %s attempts left." msgstr "" -#: oslo_db/sqlalchemy/session.py:632 +#: oslo_db/sqlalchemy/engines.py:350 #, python-format msgid "" "Parent process %(orig)s forked (%(newproc)s) with an open database " "connection, which is being discarded and recreated." msgstr "" -#: oslo_db/sqlalchemy/utils.py:127 +#: oslo_db/sqlalchemy/utils.py:100 msgid "Id not in sort_keys; is sort_keys unique?" msgstr "" diff --git a/oslo.db/locale/oslo.db.pot b/oslo.db/locale/oslo.db.pot index 2135ea9..c7064cc 100644 --- a/oslo.db/locale/oslo.db.pot +++ b/oslo.db/locale/oslo.db.pot @@ -1,82 +1,82 @@ # Translations template for oslo.db. -# Copyright (C) 2014 ORGANIZATION +# Copyright (C) 2015 ORGANIZATION # This file is distributed under the same license as the oslo.db project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2014. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2015. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.db 0.4.0.14.g0e854f2\n" +"Project-Id-Version: oslo.db 2.2.1.dev2\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-09-02 06:05+0000\n" +"POT-Creation-Date: 2015-07-29 06:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" -#: oslo/db/exception.py:133 +#: oslo_db/exception.py:150 msgid "Invalid Parameter: Encoding directive wasn't provided." msgstr "" -#: oslo/db/exception.py:161 +#: oslo_db/exception.py:186 msgid "Sort key supplied was not valid." msgstr "" -#: oslo/db/sqlalchemy/migration.py:72 +#: oslo_db/sqlalchemy/migration.py:72 msgid "version should be an integer" msgstr "" -#: oslo/db/sqlalchemy/migration.py:108 +#: oslo_db/sqlalchemy/migration.py:112 #, python-format msgid "" "Tables \"%s\" have non utf8 collation, please make sure all tables are " "CHARSET=utf8" msgstr "" -#: oslo/db/sqlalchemy/migration.py:132 +#: oslo_db/sqlalchemy/migration.py:136 msgid "" "The database is not under version control, but has tables. Please stamp " "the current version of the schema manually." msgstr "" -#: oslo/db/sqlalchemy/utils.py:122 +#: oslo_db/sqlalchemy/utils.py:122 msgid "Unknown sort direction, must be 'desc' or 'asc'" msgstr "" -#: oslo/db/sqlalchemy/utils.py:165 +#: oslo_db/sqlalchemy/utils.py:181 #, python-format msgid "" "There is no `deleted` column in `%s` table. Project doesn't use soft-" "deleted feature." msgstr "" -#: oslo/db/sqlalchemy/utils.py:179 +#: oslo_db/sqlalchemy/utils.py:195 #, python-format msgid "There is no `project_id` column in `%s` table." msgstr "" -#: oslo/db/sqlalchemy/utils.py:291 +#: oslo_db/sqlalchemy/utils.py:307 msgid "model should be a subclass of ModelBase" msgstr "" -#: oslo/db/sqlalchemy/utils.py:340 +#: oslo_db/sqlalchemy/utils.py:377 #, python-format msgid "" "Please specify column %s in col_name_col_instance param. It is required " "because column has unsupported type by SQLite." msgstr "" -#: oslo/db/sqlalchemy/utils.py:346 +#: oslo_db/sqlalchemy/utils.py:383 #, python-format msgid "" "col_name_col_instance param has wrong type of column instance for column " "%s It should be instance of sqlalchemy.Column." msgstr "" -#: oslo/db/sqlalchemy/utils.py:454 +#: oslo_db/sqlalchemy/utils.py:448 msgid "Unsupported id columns type" msgstr "" diff --git a/oslo_db/sqlalchemy/test_migrations.py b/oslo_db/sqlalchemy/test_migrations.py index 5204b85..627e563 100644 --- a/oslo_db/sqlalchemy/test_migrations.py +++ b/oslo_db/sqlalchemy/test_migrations.py @@ -185,7 +185,8 @@ class WalkVersionsMixin(object): self.REPOSITORY)) LOG.debug('latest version is %s', self.REPOSITORY.latest) - versions = range(self.INIT_VERSION + 1, self.REPOSITORY.latest + 1) + versions = range(int(self.INIT_VERSION) + 1, + int(self.REPOSITORY.latest) + 1) for version in versions: # upgrade -> downgrade -> upgrade diff --git a/oslo_db/tests/sqlalchemy/test_migrations.py b/oslo_db/tests/sqlalchemy/test_migrations.py index 3f37502..3df4021 100644 --- a/oslo_db/tests/sqlalchemy/test_migrations.py +++ b/oslo_db/tests/sqlalchemy/test_migrations.py @@ -15,6 +15,7 @@ # under the License. import fixtures +from migrate.versioning import api as versioning_api import mock from oslotest import base as test import six @@ -30,7 +31,7 @@ class TestWalkVersions(test.BaseTestCase, migrate.WalkVersionsMixin): migration_api = mock.MagicMock() REPOSITORY = mock.MagicMock() engine = mock.MagicMock() - INIT_VERSION = 4 + INIT_VERSION = versioning_api.VerNum(4) @property def migrate_engine(self): @@ -96,7 +97,7 @@ class TestWalkVersions(test.BaseTestCase, migrate.WalkVersionsMixin): @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_up') @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_down') def test_walk_versions_all_default(self, migrate_up, migrate_down): - self.REPOSITORY.latest = 20 + self.REPOSITORY.latest = versioning_api.VerNum(20) self.migration_api.db_version.return_value = self.INIT_VERSION self.walk_versions() @@ -106,7 +107,8 @@ class TestWalkVersions(test.BaseTestCase, migrate.WalkVersionsMixin): self.migration_api.db_version.assert_called_with( self.engine, self.REPOSITORY) - versions = range(self.INIT_VERSION + 1, self.REPOSITORY.latest + 1) + versions = range(int(self.INIT_VERSION) + 1, + int(self.REPOSITORY.latest) + 1) upgraded = [mock.call(v, with_data=True) for v in versions] self.assertEqual(self.migrate_up.call_args_list, upgraded) @@ -117,12 +119,13 @@ class TestWalkVersions(test.BaseTestCase, migrate.WalkVersionsMixin): @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_up') @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_down') def test_walk_versions_all_true(self, migrate_up, migrate_down): - self.REPOSITORY.latest = 20 + self.REPOSITORY.latest = versioning_api.VerNum(20) self.migration_api.db_version.return_value = self.INIT_VERSION self.walk_versions(snake_walk=True, downgrade=True) - versions = range(self.INIT_VERSION + 1, self.REPOSITORY.latest + 1) + versions = range(int(self.INIT_VERSION) + 1, + int(self.REPOSITORY.latest) + 1) upgraded = [] for v in versions: upgraded.append(mock.call(v, with_data=True)) @@ -141,12 +144,13 @@ class TestWalkVersions(test.BaseTestCase, migrate.WalkVersionsMixin): @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_up') @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_down') def test_walk_versions_true_false(self, migrate_up, migrate_down): - self.REPOSITORY.latest = 20 + self.REPOSITORY.latest = versioning_api.VerNum(20) self.migration_api.db_version.return_value = self.INIT_VERSION self.walk_versions(snake_walk=True, downgrade=False) - versions = range(self.INIT_VERSION + 1, self.REPOSITORY.latest + 1) + versions = range(int(self.INIT_VERSION) + 1, + int(self.REPOSITORY.latest) + 1) upgraded = [] for v in versions: @@ -160,12 +164,13 @@ class TestWalkVersions(test.BaseTestCase, migrate.WalkVersionsMixin): @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_up') @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_down') def test_walk_versions_all_false(self, migrate_up, migrate_down): - self.REPOSITORY.latest = 20 + self.REPOSITORY.latest = versioning_api.VerNum(20) self.migration_api.db_version.return_value = self.INIT_VERSION self.walk_versions(snake_walk=False, downgrade=False) - versions = range(self.INIT_VERSION + 1, self.REPOSITORY.latest + 1) + versions = range(int(self.INIT_VERSION) + 1, + int(self.REPOSITORY.latest) + 1) upgraded = [mock.call(v, with_data=True) for v in versions] self.assertEqual(upgraded, self.migrate_up.call_args_list) diff --git a/test-requirements.txt b/test-requirements.txt index dd16eb9..310eba6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -15,7 +15,7 @@ psycopg2 python-subunit>=0.0.18 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 oslosphinx>=2.5.0 # Apache-2.0 -oslotest>=1.7.0 # Apache-2.0 +oslotest>=1.9.0 # Apache-2.0 testrepository>=0.0.18 testtools>=1.4.0 tempest-lib>=0.6.1 |