From 1147f61db70fd214e2167c72f52b43e72ced4434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20T=C3=A1mara?= Date: Sun, 26 Jul 2009 02:25:50 -0500 Subject: [PATCH 1/2] updated es_CO translation --- trytond/ir/es_CO.csv | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/trytond/ir/es_CO.csv b/trytond/ir/es_CO.csv index 712cfc43d2..5e1e063a4a 100644 --- a/trytond/ir/es_CO.csv +++ b/trytond/ir/es_CO.csv @@ -46,7 +46,7 @@ error,read_error,0,"You try to read records that don't exist anymore! (Document type: %s)",¡Está intentando leer registros que ya no existen!,0 error,required_field,0,"The field ""%s"" on ""%s"" is required.","Se requiere el campo ""%s"" en ""%s"".",0 error,required_validation_record,0,"The field ""%s"" on ""%s"" is required.","Se requiere el campo ""%s"" en ""%s"".",0 -error,size_validation_record,0,"The field ""%s"" on ""%s"" is too long.","El campo ""%s"" en ""%s"" es muy largo.",0 +error,size_validation_record,0,"The field ""%s"" on ""%s"" is too long.","El campo ""%s"" en ""%s"" es demasiado largo.",0 error,write_error,0,"You try to write on records that don't exist anymore! (Document type: %s)",¡Está tratando de escribir registros que ya no existen!,0 error,write_xml_record,0,You are not allowed to modify this record.,No esta autorizado para modificar este registro.,0 @@ -99,11 +99,11 @@ field,"ir.action.wizard,email",0,Email,Correo Electrónico,0 field,"ir.action.wizard,model",0,Model,Modelo,0 field,"ir.action.wizard,rec_name",0,Name,Nombre,0 field,"ir.action.wizard_size,height",0,Height,Altura,0 -field,"ir.action.wizard_size,model",0,Model,Modelo,1 -field,"ir.action.wizard_size,rec_name",0,Name,Nombre de Contacto,1 -field,"ir.action.wizard_size,user",0,User,Usuario,1 -field,"ir.action.wizard_size,width",0,Width,Ancho,1 -field,"ir.action.wizard_size,wizard",0,Wizard,Asistente,1 +field,"ir.action.wizard_size,model",0,Model,Modelo,0 +field,"ir.action.wizard_size,rec_name",0,Name,Nombre,0 +field,"ir.action.wizard_size,user",0,User,Usuario,0 +field,"ir.action.wizard_size,width",0,Width,Ancho,0 +field,"ir.action.wizard_size,wizard",0,Wizard,Asistente,0 field,"ir.action.wizard,wiz_name",0,Wizard name,Nombre del Asistente,0 field,"ir.attachment,collision",0,Collision,Colisión,0 field,"ir.attachment,datas",0,Datas,Datos,0 @@ -160,7 +160,7 @@ field,"ir.model.access,description",0,Description,Descripción,0 field,"ir.model.access,group",0,Group,Grupo,0 field,"ir.model.access,model",0,Model,Modelo,0 field,"ir.model.access,perm_create",0,Create Access,Crear Acceso,0 -field,"ir.model.access,perm_delete",0,Delete Access,Permiso para Eliminar,1 +field,"ir.model.access,perm_delete",0,Delete Access,Permiso para Eliminar,0 field,"ir.model.access,perm_read",0,Read Access,Acceso de Lectura,0 field,"ir.model.access,perm_write",0,Write Access,Acceso de Escritura,0 field,"ir.model.access,rec_name",0,Name,Nombre,0 @@ -218,10 +218,10 @@ field,"ir.rule.group,global_p",0,Global,Global,0 field,"ir.rule.group,groups",0,Groups,Grupos,0 field,"ir.rule.group,model",0,Model,Modelo,0 field,"ir.rule.group,name",0,Name,Nombre,0 -field,"ir.rule.group,perm_create",0,Create Access,Crear Acceso,1 -field,"ir.rule.group,perm_delete",0,Delete Access,Permiso para Eliminar,1 -field,"ir.rule.group,perm_read",0,Read Access,Acceso de Lectura,1 -field,"ir.rule.group,perm_write",0,Write Access,Acceso de Escritura,1 +field,"ir.rule.group,perm_create",0,Create Access,Permiso para Crear,0 +field,"ir.rule.group,perm_delete",0,Delete Access,Permiso para Eliminar,0 +field,"ir.rule.group,perm_read",0,Read Access,Permiso de Lectura,0 +field,"ir.rule.group,perm_write",0,Write Access,Permiso de Escritura,0 field,"ir.rule.group,rec_name",0,Name,Nombre,0 field,"ir.rule.group,rules",0,Tests,Pruebas,0 field,"ir.rule.group,users",0,Users,Usuarios,0 @@ -323,7 +323,7 @@ model,"ir.action,name",0,Action,Acción,0 model,"ir.action,name",act_action_form,Actions,Acciones,0 model,"ir.action,name",act_attachment_form,Attachments,Adjuntos,0 model,"ir.action,name",act_translation_clean,Clean Translations,Limpiar Traducciones,0 -model,"ir.action,name",act_config_wizard_item_form,Config Wizard Items,Configurar los elementos del Wizard,0 +model,"ir.action,name",act_config_wizard_item_form,Config Wizard Items,Configurar los elementos del Asistente,0 model,"ir.action,name",act_property_form_default,Default Properties,Propiedades predeterminadas,0 model,"ir.action,name",act_default_form,Defaults,Predeterminados,0 model,"ir.action,name",act_export_form,Exports,Exportes,0 @@ -359,7 +359,7 @@ model,"ir.action,name",act_action_wizard_form,Wizards,Asistentes,0 model,"ir.action,name",act_action_wizard_size_form,Wizard Sizes,Tamaños del Asistente,0 model,"ir.action.report,name",0,Action report,Acción de reporte,0 model,"ir.action.url,name",0,Action URL,Acción URL,0 -model,"ir.action.wizard,name",0,Action wizard,Acción de ayudante,0 +model,"ir.action.wizard,name",0,Action wizard,Acción de asistente,0 model,"ir.action.wizard_size,name",0,Action Wizard Size,Tamaño de la Acción del Asistente,0 model,"ir.attachment,name",0,Attachment,Adjunto,0 model,"ir.cache,name",0,Cache,Caché,0 @@ -374,8 +374,8 @@ model,"ir.model.data,name",0,Model data,Modelo de dato,0 model,"ir.model.field,name",0,Model field,Modelo de campo,0 model,"ir.model,name",0,Model,Modelo,0 model,"ir.model.print_model_graph.init,name",0,Print Model Graph Init,Imprime Inicio de Modelo de Gráfica,0 -model,"ir.module.module.config_wizard.first,name",0,Module Config Wizard First,Modulo Configure del Ayudante Primero,0 -model,"ir.module.module.config_wizard.item,name",0,Config wizard to run after installing module,Configure el ayudante a ejecutar después de la instalación del módulo,0 +model,"ir.module.module.config_wizard.first,name",0,Module Config Wizard First,Primero configure el Módulo con el Asistente,0 +model,"ir.module.module.config_wizard.item,name",0,Config wizard to run after installing module,Configure el asistente a ejecutar después de la instalación del módulo,0 model,"ir.module.module.dependency,name",0,Module dependency,Dependencia del módulo,0 model,"ir.module.module.install_upgrade.init,name",0,Module Install Upgrade Init,Inicio de actualización de Instalación del Módulo,0 model,"ir.module.module.install_upgrade.start,name",0,Module Install Upgrade Start,Comienzo de actualización de Instalación del Módulo,0 @@ -399,7 +399,7 @@ model,"ir.ui.menu,name",menu_act_action,Actions,Acciones,0 model,"ir.ui.menu,name",menu_administration,Administration,Administración,0 model,"ir.ui.menu,name",menu_attachment_form,Attachments,Adjuntos,0 model,"ir.ui.menu,name",menu_translation_clean,Clean Translations,Limpiar Traducciones,0 -model,"ir.ui.menu,name",menu_config_wizard_item_form,Config Wizard Items,Configurar los elementos del Wizard,0 +model,"ir.ui.menu,name",menu_config_wizard_item_form,Config Wizard Items,Configurar los elementos del Asistente,0 model,"ir.ui.menu,name",menu_property_form_default,Default Properties,Propiedades predeterminadas,0 model,"ir.ui.menu,name",menu_default_form,Defaults,Predeterminados,0 model,"ir.ui.menu,name",menu_export_form,Exports,Exportes,0 @@ -598,7 +598,7 @@ view,ir.module.module,0,Modules,Módulos,0 view,ir.module.module.config_wizard.first,0,depending on the modules you have installed.,dependiendo de los módulos que haya instalado.,0 view,ir.module.module.config_wizard.first,0,Welcome to the module configuration wizard!,Bienvenido al Asistente de configuración del módulo!,0 view,ir.module.module.config_wizard.first,0,You will be able to configure your installation,Tendrá oportunidad de configurar su instalación,0 -view,ir.module.module.config_wizard.item,0,Config Wizard Items,Configurar los elementos del Wizard,0 +view,ir.module.module.config_wizard.item,0,Config Wizard Items,Configurar los elementos del Asistente,0 view,ir.module.module.install_upgrade.init,0,Note that this operation my take a few minutes.,Tenga en cuenta que esta operación puede durar varios minutos.,0 view,ir.module.module.install_upgrade.init,0,System Upgrade,Actualización del Sistema,0 view,ir.module.module.install_upgrade.init,0,Your system will be upgraded.,Su sistema se actualizará,0 From f3356467d822e09cb8fb1fc7fb88737daf9a4309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 27 Jul 2009 14:49:51 +0200 Subject: [PATCH 2/2] Remove memory database creation from client because it doesn't work with multi-thread. --- trytond/backend/sqlite/database.py | 32 ++++++++++++------------------ 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/trytond/backend/sqlite/database.py b/trytond/backend/sqlite/database.py index d94ee66936..603b198f71 100644 --- a/trytond/backend/sqlite/database.py +++ b/trytond/backend/sqlite/database.py @@ -43,33 +43,29 @@ def now(): class Database(DatabaseInterface): _memory_database = None - _memory_created = False _conn = None def __new__(cls, database_name=':memory:'): - if database_name in (':memory:', 'memory') \ + if database_name == ':memory:' \ and cls._memory_database: return cls._memory_database return DatabaseInterface.__new__(cls, database_name=database_name) def __init__(self, database_name=':memory:'): super(Database, self).__init__(database_name=database_name) - if database_name in (':memory:', 'memory'): + if database_name == ':memory:': Database._memory_database = self def connect(self): - if self._conn is not None: - return self - if self.database_name in (':memory:', 'memory'): + if self.database_name == ':memory:': path = ':memory:' - if self.database_name == 'memory' \ - and not self._memory_created: - raise Exception('Database doesn\'t exist!') else: path = os.path.join(CONFIG['data_path'], self.database_name + '.sqlite') if not os.path.isfile(path): raise Exception('Database doesn\'t exist!') + if self._conn is not None: + return self self._conn = sqlite.connect(path, detect_types=sqlite.PARSE_DECLTYPES) self._conn.create_function('date_trunc', 2, date_trunc) self._conn.create_function('now', 0, now) @@ -85,17 +81,15 @@ class Database(DatabaseInterface): return Cursor(self._conn, self.database_name) def close(self): - if self.database_name in (':memory:', 'memory'): + if self.database_name == ':memory:': return if self._conn is None: return self._conn = None def create(self, cursor, database_name): - if database_name in (':memory:', 'memory'): + if database_name == ':memory:': path = ':memory:' - if database_name == 'memory': - self._memory_created = True else: if os.sep in database_name: return @@ -107,7 +101,7 @@ class Database(DatabaseInterface): conn.close() def drop(self, cursor, database_name): - if database_name in (':memory', 'memory'): + if database_name == ':memory': self._conn = None return if os.sep in database_name: @@ -117,7 +111,7 @@ class Database(DatabaseInterface): @staticmethod def dump(database_name): - if database_name in (':memory:', 'memory'): + if database_name == ':memory:': raise Exception('Unable to dump memory database!') if os.sep in database_name: raise Exception('Wrong database name!') @@ -130,7 +124,7 @@ class Database(DatabaseInterface): @staticmethod def restore(database_name, data): - if database_name in (':memory:', 'memory'): + if database_name == ':memory:': raise Exception('Unable to restore memory database!') if os.sep in database_name: raise Exception('Wrong database name!') @@ -145,9 +139,9 @@ class Database(DatabaseInterface): @staticmethod def list(cursor): res = [] - for file in os.listdir(CONFIG['data_path']) + ['memory']: - if file.endswith('.sqlite') or file == 'memory': - if file == 'memory': + for file in os.listdir(CONFIG['data_path']) + [':memory:']: + if file.endswith('.sqlite') or file == ':memory:': + if file == ':memory:': db_name = ':memory:' else: db_name = file[:-7]