# HG changeset patch # User ymh # Date 1424943190 -3600 # Node ID 604b887e70c3cee7301d7106e7c85b69de96fd03 # Parent 1121fd3d8b0e441756b37513923337b7f4bacb3b add state history to renkan, correct get into post, generally prepare ground for mail management diff -r 1121fd3d8b0e -r 604b887e70c3 .settings/org.eclipse.core.resources.prefs --- a/.settings/org.eclipse.core.resources.prefs Thu Feb 26 15:51:03 2015 +0100 +++ b/.settings/org.eclipse.core.resources.prefs Thu Feb 26 10:33:10 2015 +0100 @@ -34,6 +34,7 @@ encoding//src/hdalab/__init__.py=utf-8 encoding//src/hdalab/config.py=utf-8 encoding//src/hdalab/fields.py=utf-8 +encoding//src/hdalab/forms.py=utf-8 encoding//src/hdalab/manage.py=utf-8 encoding//src/hdalab/management/commands/export_tags_csv.py=utf-8 encoding//src/hdalab/management/commands/export_wpcategory_csv.py=utf-8 @@ -58,7 +59,9 @@ encoding//src/hdalab/migrations/0011_auto__add_field_dbpediafieldstranslation_is_label_translated__add_fiel.py=utf-8 encoding//src/hdalab/migrations/0012_auto__add_hdalabrenkan.py=utf-8 encoding//src/hdalab/migrations/0013_auto__chg_field_dbpediafields_tag__add_unique_tagyears_tag.py=utf-8 +encoding//src/hdalab/migrations/0014_auto__add_hdalabrenkanstatetransition__chg_field_dbpediafields_tag.py=utf-8 encoding//src/hdalab/models/dataviz.py=utf-8 +encoding//src/hdalab/services.py=utf-8 encoding//src/hdalab/settings.py=utf-8 encoding//src/hdalab/urls.py=utf-8 encoding//src/hdalab/utils.py=utf-8 diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdabo/migrations/0001_initial.py --- a/src/hdabo/migrations/0001_initial.py Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdabo/migrations/0001_initial.py Thu Feb 26 10:33:10 2015 +0100 @@ -9,6 +9,22 @@ def forwards(self, orm): + #create auth_user table here to adjust to application dependencies + db.create_table('auth_user', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('password', self.gf('django.db.models.fields.CharField')(max_length=128)), + ('last_login', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), + ('is_superuser', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('username', self.gf('django.db.models.fields.CharField')(unique=True, max_length=30)), + ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), + ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), + ('email', self.gf('django.db.models.fields.EmailField')(max_length=75, blank=True)), + ('is_staff', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('is_active', self.gf('django.db.models.fields.BooleanField')(default=True)), + ('date_joined', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), + )) + + # Adding model 'Organisation' db.create_table('hdabo_organisation', ( ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), @@ -249,6 +265,9 @@ # Deleting model 'Datasheet_primary_themes' db.delete_table('hdabo_datasheet_primary_themes') + + # delete table auth_user + db.delete_table('auth_user') models = { diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdabo/migrations/0003_update_redirection.py --- a/src/hdabo/migrations/0003_update_redirection.py Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdabo/migrations/0003_update_redirection.py Thu Feb 26 10:33:10 2015 +0100 @@ -12,6 +12,9 @@ sys.stdout.write("Processing %d tags\n" % (queryset_count)) sys.stdout.flush() + + if queryset_count == 0: + return site = wiki.Wiki("http://fr.wikipedia.org/w/api.php") #@UndefinedVariable diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdabo/migrations/0006_auto__add_user__chg_field_datasheet_validator.py --- a/src/hdabo/migrations/0006_auto__add_user__chg_field_datasheet_validator.py Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdabo/migrations/0006_auto__add_user__chg_field_datasheet_validator.py Thu Feb 26 10:33:10 2015 +0100 @@ -7,40 +7,45 @@ class Migration(SchemaMigration): + needed_by = [ + ('renkanmanager','0001_initial'), + ] + def forwards(self, orm): # Adding model 'User' -# db.create_table('auth_user', ( -# (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), -# ('password', self.gf('django.db.models.fields.CharField')(max_length=128)), -# ('last_login', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), -# ('is_superuser', self.gf('django.db.models.fields.BooleanField')(default=False)), -# ('username', self.gf('django.db.models.fields.CharField')(unique=True, max_length=30)), -# ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), -# ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), -# ('email', self.gf('django.db.models.fields.EmailField')(max_length=75, blank=True)), -# ('is_staff', self.gf('django.db.models.fields.BooleanField')(default=False)), -# ('is_active', self.gf('django.db.models.fields.BooleanField')(default=True)), -# ('date_joined', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), -# )) -# db.send_create_signal(u'hdabo', ['User']) -# -# # Adding M2M table for field groups on 'User' -# m2m_table_name = db.shorten_name('auth_user_groups') -# db.create_table(m2m_table_name, ( -# ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), -# ('user', models.ForeignKey(orm[u'hdabo.user'], null=False)), -# ('group', models.ForeignKey(orm[u'auth.group'], null=False)) -# )) -# db.create_unique(m2m_table_name, ['user_id', 'group_id']) -# -# # Adding M2M table for field user_permissions on 'User' -# m2m_table_name = db.shorten_name('auth_user_user_permissions') -# db.create_table(m2m_table_name, ( -# ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), -# ('user', models.ForeignKey(orm[u'hdabo.user'], null=False)), -# ('permission', models.ForeignKey(orm[u'auth.permission'], null=False)) -# )) -# db.create_unique(m2m_table_name, ['user_id', 'permission_id']) + #Table creation moved to 0001_initial to fix initial dependencies +# db.create_table('auth_user', ( +# (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), +# ('password', self.gf('django.db.models.fields.CharField')(max_length=128)), +# ('last_login', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), +# ('is_superuser', self.gf('django.db.models.fields.BooleanField')(default=False)), +# ('username', self.gf('django.db.models.fields.CharField')(unique=True, max_length=30)), +# ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), +# ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), +# ('email', self.gf('django.db.models.fields.EmailField')(max_length=75, blank=True)), +# ('is_staff', self.gf('django.db.models.fields.BooleanField')(default=False)), +# ('is_active', self.gf('django.db.models.fields.BooleanField')(default=True)), +# ('date_joined', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), +# )) + db.send_create_signal(u'hdabo', ['User']) + + # Adding M2M table for field groups on 'User' + m2m_table_name = db.shorten_name('auth_user_groups') + db.create_table(m2m_table_name, ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('user', models.ForeignKey(orm[u'hdabo.user'], null=False)), + ('group', models.ForeignKey(orm[u'auth.group'], null=False)) + )) + db.create_unique(m2m_table_name, ['user_id', 'group_id']) + + # Adding M2M table for field user_permissions on 'User' + m2m_table_name = db.shorten_name('auth_user_user_permissions') + db.create_table(m2m_table_name, ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('user', models.ForeignKey(orm[u'hdabo.user'], null=False)), + ('permission', models.ForeignKey(orm[u'auth.permission'], null=False)) + )) + db.create_unique(m2m_table_name, ['user_id', 'permission_id']) # Changing field 'Datasheet.validator' diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/fields.py --- a/src/hdalab/fields.py Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/fields.py Thu Feb 26 10:33:10 2015 +0100 @@ -46,7 +46,7 @@ [OneToOneField], [], # Positional arguments (not used) { # Keyword argument - "related_default": ["related_default", {"default": None}], + "related_default": ["related_default", {"default": None, "is_django_function": True}], }, ), ], ["^hdalab\.fields\.OneToOneField"]) \ No newline at end of file diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/forms.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/forms.py Thu Feb 26 10:33:10 2015 +0100 @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +''' +Created on Feb 20, 2015 + +@author: ymh +''' + +from django import forms +from hdalab.models import HdalabRenkan + +class HdalabRenkanStateForm(forms.ModelForm): + class Meta: + model = HdalabRenkan + fields = ['id','state'] + + message = forms.CharField(widget=forms.Textarea,required=False) + next = forms.CharField(required=False) \ No newline at end of file diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/locale/de/LC_MESSAGES/django.mo Binary file src/hdalab/locale/de/LC_MESSAGES/django.mo has changed diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/locale/de/LC_MESSAGES/django.po --- a/src/hdalab/locale/de/LC_MESSAGES/django.po Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/locale/de/LC_MESSAGES/django.po Thu Feb 26 10:33:10 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-18 19:35-0600\n" +"POT-Creation-Date: 2015-02-26 03:27-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,107 +41,70 @@ msgid "Japanese" msgstr "Japanisch" -#: models/renkan.py:26 +#: models/renkan.py:28 msgid "edition_state" msgstr "" -#: models/renkan.py:27 +#: models/renkan.py:29 msgid "moderated_state" msgstr "" -#: models/renkan.py:28 +#: models/renkan.py:30 msgid "published_state" msgstr "" -#: models/renkan.py:29 +#: models/renkan.py:31 msgid "rejected_state" msgstr "" -#: templates/a_propos.html:5 +#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 +#: templates/base.html:95 msgid "A Propos" msgstr "" -#: templates/a_propos.html:13 templates/contact.html:13 -#: templates/credits.html:13 templates/mentions_legales.html:13 -msgid "" -"\n" -"\t\t\t\tLorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse " -"pulvinar turpis at vestibulum varius. Ut malesuada nisi nec placerat " -"gravida. Proin vitae ipsum eget urna auctor fermentum sed quis nisl. Etiam " -"placerat volutpat arcu, et vestibulum magna auctor ac. Vestibulum nisi " -"nulla, ornare ac leo sed, mollis auctor arcu. Sed sed ante laoreet, bibendum " -"libero quis, fringilla lorem. Vivamus a enim convallis, convallis nibh eget, " -"pellentesque augue. Vestibulum faucibus venenatis urna non semper. Duis " -"gravida nunc vitae nisi blandit, ut ullamcorper purus semper.\n" -"\t\t\t" -msgstr "" - -#: templates/a_propos.html:19 templates/contact.html:19 -#: templates/credits.html:19 templates/mentions_legales.html:19 -msgid "" -"\t\n" -"\t\t\t\tSuspendisse tempor commodo molestie. Suspendisse ultrices leo diam, " -"eget aliquet libero luctus vel. In luctus varius dolor, eget efficitur ante " -"volutpat ut. Morbi sit amet aliquet nunc. Fusce nisi sem, imperdiet ac nulla " -"quis, volutpat interdum risus. Proin faucibus vitae orci vel congue. " -"Maecenas semper non mi in gravida.\n" -"\t\t\t" +#: templates/base.html:38 +msgid "Accueil" msgstr "" -#: templates/a_propos.html:25 templates/contact.html:25 -#: templates/credits.html:25 templates/mentions_legales.html:25 -msgid "" -"\n" -"\t\t\t\tUt dictum nisi sed lectus lacinia scelerisque at non turpis. Integer " -"ante lacus, dictum non blandit nec, ullamcorper id lectus. Mauris quis " -"lobortis quam. Morbi tempor odio nec sodales sagittis. Nullam eu ipsum leo. " -"Aliquam rhoncus ullamcorper velit ut porta. In enim sapien, faucibus in " -"congue eu, bibendum ut sem. Mauris ultricies et odio quis fermentum. In " -"luctus augue sit amet tincidunt malesuada.\n" -"\t\t\t" +#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 +msgid "Recherche" +msgstr "Einen Tag suchen" + +#: templates/base.html:40 templates/base.html.py:92 +msgid "Domaines Artistiques" +msgstr "Künstlerische Disziplinen" + +#: templates/base.html:41 templates/base.html.py:93 +msgid "Thésaurus" msgstr "" -#: templates/a_propos.html:31 templates/contact.html:31 -#: templates/credits.html:31 templates/mentions_legales.html:31 -msgid "" -"\n" -"\t\t\t\tNulla luctus, ante id hendrerit vehicula, lectus mi sollicitudin " -"nulla, at accumsan risus urna quis diam. Nulla at quam bibendum, condimentum " -"nunc sit amet, tristique dui. Donec in tempus risus, vel vulputate erat. " -"Nulla maximus leo a faucibus consectetur. Maecenas consequat facilisis dui " -"nec semper. Nam semper, felis sit amet egestas semper, erat velit sagittis " -"orci, sit amet ultrices ante nibh a lorem. Cras sagittis tellus nec " -"consequat maximus. Praesent sagittis ipsum augue, a posuere lectus maximus " -"ut.\n" -"\t\t\t" -msgstr "" - -#: templates/a_propos.html:37 templates/contact.html:37 -#: templates/credits.html:37 templates/mentions_legales.html:37 -msgid "" -"\n" -"\t\t\t\tMauris eget quam et urna consequat viverra vitae venenatis massa. " -"Vestibulum molestie porttitor sapien, eget tempus nulla. Aliquam erat " -"volutpat. Etiam sagittis dui velit, eu consequat eros varius in. Maecenas " -"tempor rhoncus ornare. Aliquam pretium malesuada leo, eget tincidunt orci " -"maximus lobortis. Aliquam sapien dolor, vulputate non bibendum vitae, " -"pellentesque quis nulla. Ut vel metus porta, molestie dui quis, sagittis " -"nibh. \n" -"\t\t\t" -msgstr "" - -#: templates/base.html:49 templates/ajax_identification/ajax_login_ok.html:4 +#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 msgid "Log out" msgstr "" -#: templates/base.html:51 templates/registration/activate.html:16 +#: templates/base.html:52 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "" +#: templates/base.html:76 +msgid "Crédits" +msgstr "" + +#: templates/base.html:77 +msgid "Mentions légales" +msgstr "" + +#: templates/base.html:90 +msgid "Rubriques" +msgstr "" + +#: templates/base.html:101 +msgid "Liens" +msgstr "" + #: templates/categories.html:5 templates/thesaurus.html:33 -#, fuzzy msgid "Recherche par arbre" msgstr "Suche nach Facetten" @@ -149,10 +112,6 @@ msgid "Explorer les domaines artistiques" msgstr "Künstlerische Disziplinen" -#: templates/contact.html:5 -msgid "Contact" -msgstr "" - #: templates/credits.html:5 msgid "Credits" msgstr "" @@ -186,7 +145,6 @@ msgstr "" #: templates/facettes.html:104 -#, fuzzy msgid "Entrez un mot-clef" msgstr "Information über ein Stichwort" @@ -291,6 +249,57 @@ "disquette." msgstr "" +#: templates/index.html:47 +msgid "" +"Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " +"d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " +"À la fois critères " +msgstr "" + +#: templates/index.html:48 +msgid "" +"de recherche et modes de visualisation des résultats, ces différentes " +"facettes se mettent à jour au fur et à mesure de vos recherches." +msgstr "" + +#: templates/index.html:59 +msgid "Navigation à travers les Arts " +msgstr "" + +#: templates/index.html:62 +msgid "" +"Explorez 9 grands domaines artistiques à travers des arborescences enrichies " +"de ressources du portail Histoire des Arts." +msgstr "" + +#: templates/index.html:76 +msgid "" +"Construisez votre carte de connaissances à partir des ressources Histoires " +"des arts et Wikipedia." +msgstr "" + +#: templates/index.html:91 +msgid "Bienvenue sur Histoire des arts‘Lab !" +msgstr "" + +#: templates/index.html:94 +msgid "" +"Naviguez autrement à travers les 5000 ressources du Portail Histoire des " +"arts :" +msgstr "" + +#: templates/index.html:95 +msgid "Visualisez vos recherches sur une ligne du temps, une carte du monde…" +msgstr "" + +#: templates/index.html:96 +msgid "Explorez les arts de ressource en ressource" +msgstr "" + +#: templates/index.html:97 +msgid "Construisez vos cartes de connaissances" +msgstr "" + #: templates/mentions_legales.html:5 msgid "Mentions legales" msgstr "" @@ -335,23 +344,22 @@ msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:57 templates/profile_home.html.py:110 -#: templates/renkan_list.html:35 templates/renkan_list.html.py:73 +#: templates/profile_home.html:57 templates/profile_home.html.py:122 +#: templates/renkan_list.html:35 templates/renkan_list.html.py:77 #: templates/editorial/manage_renkans.html:30 -#: templates/editorial/manage_renkans.html:83 +#: templates/editorial/manage_renkans.html:87 msgid "Previous" msgstr "" -#: templates/profile_home.html:58 templates/profile_home.html.py:111 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:74 +#: templates/profile_home.html:58 templates/profile_home.html.py:123 +#: templates/renkan_list.html:36 templates/renkan_list.html.py:78 #: templates/editorial/manage_renkans.html:31 -#: templates/editorial/manage_renkans.html:84 +#: templates/editorial/manage_renkans.html:88 msgid "Next" msgstr "" #: templates/profile_home.html:59 templates/renkan_list.html:37 #: templates/editorial/manage_renkans.html:32 -#, fuzzy msgid "Filter" msgstr "Filter:" @@ -419,47 +427,59 @@ msgid "Actions" msgstr "" -#: templates/profile_home.html:100 templates/renkan_list.html:66 +#: templates/profile_home.html:103 templates/renkan_list.html:69 msgid "Are you sure you want to copy this renkan ?" msgstr "" -#: templates/profile_home.html:101 +#: templates/profile_home.html:108 +msgid "remove renkan" +msgstr "" + +#: templates/profile_home.html:108 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:102 +#: templates/profile_home.html:113 templates/editorial/manage_renkans.html:77 +msgid "publish renkan" +msgstr "" + +#: templates/profile_home.html:113 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:103 +#: templates/profile_home.html:114 templates/editorial/manage_renkans.html:78 +msgid "unpublish renkan" +msgstr "" + +#: templates/profile_home.html:114 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" -#: templates/renkan_edit.html:67 +#: templates/renkan_edit.html:68 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:184 +#: templates/renkan_edit.html:185 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:185 +#: templates/renkan_edit.html:186 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:188 templates/renkan_edit.html.py:192 -#: templates/renkan_edit.html:196 -msgid "View graph in column" -msgstr "" - #: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 #: templates/renkan_edit.html:197 -msgid "View graph in line" +msgid "View graph in column" msgstr "" #: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 #: templates/renkan_edit.html:198 +msgid "View graph in line" +msgstr "" + +#: templates/renkan_edit.html:191 templates/renkan_edit.html.py:195 +#: templates/renkan_edit.html:199 msgid "View graph in circle" msgstr "" @@ -519,15 +539,19 @@ msgid "Manage renkan publication" msgstr "" -#: templates/editorial/manage_renkans.html:74 +#: templates/editorial/manage_renkans.html:77 msgid "Are you sure you want to PUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:75 +#: templates/editorial/manage_renkans.html:78 msgid "Are you sure you want to UNPUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:76 +#: templates/editorial/manage_renkans.html:79 +msgid "reject renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:79 msgid "Are you sure you want to REJECT this renkan ?" msgstr "" @@ -679,11 +703,11 @@ msgid "Mot de passe (Verification)" msgstr "" -#: views/profile.py:423 +#: views/profile.py:427 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:432 views/profile.py:511 +#: views/profile.py:436 views/profile.py:515 msgid "Period" msgstr "" @@ -693,9 +717,6 @@ #~ msgid "Nuage de mots-cles" #~ msgstr "Stichwortwolke" -#~ msgid "Rechercher un tag" -#~ msgstr "Einen Tag suchen" - #~ msgid "Chinese" #~ msgstr "Chinesisch" diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/locale/en/LC_MESSAGES/django.mo Binary file src/hdalab/locale/en/LC_MESSAGES/django.mo has changed diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/locale/en/LC_MESSAGES/django.po --- a/src/hdalab/locale/en/LC_MESSAGES/django.po Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/locale/en/LC_MESSAGES/django.po Thu Feb 26 10:33:10 2015 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-18 19:35-0600\n" +"POT-Creation-Date: 2015-02-26 03:27-0600\n" "PO-Revision-Date: 2012-03-09 02:10+0200\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: IRI\n" @@ -41,105 +41,69 @@ msgid "Japanese" msgstr "Japanese" -#: models/renkan.py:26 +#: models/renkan.py:28 msgid "edition_state" msgstr "edition" -#: models/renkan.py:27 +#: models/renkan.py:29 msgid "moderated_state" msgstr "moderated" -#: models/renkan.py:28 +#: models/renkan.py:30 msgid "published_state" msgstr "published" -#: models/renkan.py:29 +#: models/renkan.py:31 msgid "rejected_state" msgstr "rejected" -#: templates/a_propos.html:5 +#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 +#: templates/base.html:95 msgid "A Propos" msgstr "" -#: templates/a_propos.html:13 templates/contact.html:13 -#: templates/credits.html:13 templates/mentions_legales.html:13 -msgid "" -"\n" -"\t\t\t\tLorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse " -"pulvinar turpis at vestibulum varius. Ut malesuada nisi nec placerat " -"gravida. Proin vitae ipsum eget urna auctor fermentum sed quis nisl. Etiam " -"placerat volutpat arcu, et vestibulum magna auctor ac. Vestibulum nisi " -"nulla, ornare ac leo sed, mollis auctor arcu. Sed sed ante laoreet, bibendum " -"libero quis, fringilla lorem. Vivamus a enim convallis, convallis nibh eget, " -"pellentesque augue. Vestibulum faucibus venenatis urna non semper. Duis " -"gravida nunc vitae nisi blandit, ut ullamcorper purus semper.\n" -"\t\t\t" -msgstr "" - -#: templates/a_propos.html:19 templates/contact.html:19 -#: templates/credits.html:19 templates/mentions_legales.html:19 -msgid "" -"\t\n" -"\t\t\t\tSuspendisse tempor commodo molestie. Suspendisse ultrices leo diam, " -"eget aliquet libero luctus vel. In luctus varius dolor, eget efficitur ante " -"volutpat ut. Morbi sit amet aliquet nunc. Fusce nisi sem, imperdiet ac nulla " -"quis, volutpat interdum risus. Proin faucibus vitae orci vel congue. " -"Maecenas semper non mi in gravida.\n" -"\t\t\t" +#: templates/base.html:38 +msgid "Accueil" msgstr "" -#: templates/a_propos.html:25 templates/contact.html:25 -#: templates/credits.html:25 templates/mentions_legales.html:25 -msgid "" -"\n" -"\t\t\t\tUt dictum nisi sed lectus lacinia scelerisque at non turpis. Integer " -"ante lacus, dictum non blandit nec, ullamcorper id lectus. Mauris quis " -"lobortis quam. Morbi tempor odio nec sodales sagittis. Nullam eu ipsum leo. " -"Aliquam rhoncus ullamcorper velit ut porta. In enim sapien, faucibus in " -"congue eu, bibendum ut sem. Mauris ultricies et odio quis fermentum. In " -"luctus augue sit amet tincidunt malesuada.\n" -"\t\t\t" +#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 +msgid "Recherche" +msgstr "Tag search" + +#: templates/base.html:40 templates/base.html.py:92 +msgid "Domaines Artistiques" +msgstr "Artistic discipline" + +#: templates/base.html:41 templates/base.html.py:93 +msgid "Thésaurus" msgstr "" -#: templates/a_propos.html:31 templates/contact.html:31 -#: templates/credits.html:31 templates/mentions_legales.html:31 -msgid "" -"\n" -"\t\t\t\tNulla luctus, ante id hendrerit vehicula, lectus mi sollicitudin " -"nulla, at accumsan risus urna quis diam. Nulla at quam bibendum, condimentum " -"nunc sit amet, tristique dui. Donec in tempus risus, vel vulputate erat. " -"Nulla maximus leo a faucibus consectetur. Maecenas consequat facilisis dui " -"nec semper. Nam semper, felis sit amet egestas semper, erat velit sagittis " -"orci, sit amet ultrices ante nibh a lorem. Cras sagittis tellus nec " -"consequat maximus. Praesent sagittis ipsum augue, a posuere lectus maximus " -"ut.\n" -"\t\t\t" -msgstr "" - -#: templates/a_propos.html:37 templates/contact.html:37 -#: templates/credits.html:37 templates/mentions_legales.html:37 -msgid "" -"\n" -"\t\t\t\tMauris eget quam et urna consequat viverra vitae venenatis massa. " -"Vestibulum molestie porttitor sapien, eget tempus nulla. Aliquam erat " -"volutpat. Etiam sagittis dui velit, eu consequat eros varius in. Maecenas " -"tempor rhoncus ornare. Aliquam pretium malesuada leo, eget tincidunt orci " -"maximus lobortis. Aliquam sapien dolor, vulputate non bibendum vitae, " -"pellentesque quis nulla. Ut vel metus porta, molestie dui quis, sagittis " -"nibh. \n" -"\t\t\t" -msgstr "" - -#: templates/base.html:49 templates/ajax_identification/ajax_login_ok.html:4 +#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 msgid "Log out" msgstr "Log out" -#: templates/base.html:51 templates/registration/activate.html:16 +#: templates/base.html:52 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "Log in" +#: templates/base.html:76 +msgid "Crédits" +msgstr "Credits" + +#: templates/base.html:77 +msgid "Mentions légales" +msgstr "Legal Notices" + +#: templates/base.html:90 +msgid "Rubriques" +msgstr "" + +#: templates/base.html:101 +msgid "Liens" +msgstr "" + #: templates/categories.html:5 templates/thesaurus.html:33 msgid "Recherche par arbre" msgstr "Tree search" @@ -148,10 +112,6 @@ msgid "Explorer les domaines artistiques" msgstr "Explore by artistic discipline" -#: templates/contact.html:5 -msgid "Contact" -msgstr "Contact" - #: templates/credits.html:5 msgid "Credits" msgstr "Credits" @@ -303,6 +263,57 @@ msgstr "" "Then, you can save your work, clicking on the icon representing a floppydisk." +#: templates/index.html:47 +msgid "" +"Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " +"d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " +"À la fois critères " +msgstr "" + +#: templates/index.html:48 +msgid "" +"de recherche et modes de visualisation des résultats, ces différentes " +"facettes se mettent à jour au fur et à mesure de vos recherches." +msgstr "" + +#: templates/index.html:59 +msgid "Navigation à travers les Arts " +msgstr "" + +#: templates/index.html:62 +msgid "" +"Explorez 9 grands domaines artistiques à travers des arborescences enrichies " +"de ressources du portail Histoire des Arts." +msgstr "" + +#: templates/index.html:76 +msgid "" +"Construisez votre carte de connaissances à partir des ressources Histoires " +"des arts et Wikipedia." +msgstr "" + +#: templates/index.html:91 +msgid "Bienvenue sur Histoire des arts‘Lab !" +msgstr "" + +#: templates/index.html:94 +msgid "" +"Naviguez autrement à travers les 5000 ressources du Portail Histoire des " +"arts :" +msgstr "" + +#: templates/index.html:95 +msgid "Visualisez vos recherches sur une ligne du temps, une carte du monde…" +msgstr "" + +#: templates/index.html:96 +msgid "Explorez les arts de ressource en ressource" +msgstr "" + +#: templates/index.html:97 +msgid "Construisez vos cartes de connaissances" +msgstr "" + #: templates/mentions_legales.html:5 msgid "Mentions legales" msgstr "Legal Notices" @@ -347,17 +358,17 @@ msgid "Nouveau Renkan" msgstr "New renkan" -#: templates/profile_home.html:57 templates/profile_home.html.py:110 -#: templates/renkan_list.html:35 templates/renkan_list.html.py:73 +#: templates/profile_home.html:57 templates/profile_home.html.py:122 +#: templates/renkan_list.html:35 templates/renkan_list.html.py:77 #: templates/editorial/manage_renkans.html:30 -#: templates/editorial/manage_renkans.html:83 +#: templates/editorial/manage_renkans.html:87 msgid "Previous" msgstr "Previous" -#: templates/profile_home.html:58 templates/profile_home.html.py:111 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:74 +#: templates/profile_home.html:58 templates/profile_home.html.py:123 +#: templates/renkan_list.html:36 templates/renkan_list.html.py:78 #: templates/editorial/manage_renkans.html:31 -#: templates/editorial/manage_renkans.html:84 +#: templates/editorial/manage_renkans.html:88 msgid "Next" msgstr "Next" @@ -430,48 +441,60 @@ msgid "Actions" msgstr "Actions" -#: templates/profile_home.html:100 templates/renkan_list.html:66 +#: templates/profile_home.html:103 templates/renkan_list.html:69 msgid "Are you sure you want to copy this renkan ?" msgstr "Are you sure you want to copy this renkan ?" -#: templates/profile_home.html:101 +#: templates/profile_home.html:108 +msgid "remove renkan" +msgstr "Remove Renkan" + +#: templates/profile_home.html:108 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" "Are you sure you want to delete this renkan ? You cannot undo this action." -#: templates/profile_home.html:102 +#: templates/profile_home.html:113 templates/editorial/manage_renkans.html:77 +msgid "publish renkan" +msgstr "publish renkan" + +#: templates/profile_home.html:113 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "Are you sure you want to ask to publish this renkan ?" -#: templates/profile_home.html:103 +#: templates/profile_home.html:114 templates/editorial/manage_renkans.html:78 +msgid "unpublish renkan" +msgstr "unpublish renkan" + +#: templates/profile_home.html:114 msgid "Are you sure you want to unpublish this renkan ?" -msgstr "Are you sure you want to ask to publish this renkan ?" +msgstr "Are you sure you want to ask to unpublish this renkan ?" -#: templates/renkan_edit.html:67 +#: templates/renkan_edit.html:68 msgid "Ressources" msgstr "Resources" -#: templates/renkan_edit.html:184 +#: templates/renkan_edit.html:185 msgid "Change organisation" msgstr "Change organisation" -#: templates/renkan_edit.html:185 +#: templates/renkan_edit.html:186 msgid "(Indisponible si modification du RENKAN)" msgstr "(Not allowed if renkan has been modified)" -#: templates/renkan_edit.html:188 templates/renkan_edit.html.py:192 -#: templates/renkan_edit.html:196 +#: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 +#: templates/renkan_edit.html:197 msgid "View graph in column" msgstr "View graph in column" -#: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 -#: templates/renkan_edit.html:197 +#: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 +#: templates/renkan_edit.html:198 msgid "View graph in line" msgstr "View graph in line" -#: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 -#: templates/renkan_edit.html:198 +#: templates/renkan_edit.html:191 templates/renkan_edit.html.py:195 +#: templates/renkan_edit.html:199 msgid "View graph in circle" msgstr "View graph in circle" @@ -531,15 +554,19 @@ msgid "Manage renkan publication" msgstr "Manage renkan publication" -#: templates/editorial/manage_renkans.html:74 +#: templates/editorial/manage_renkans.html:77 msgid "Are you sure you want to PUBLISH this renkan ?" msgstr "Are you sure you want to PUBLISH this renkan?" -#: templates/editorial/manage_renkans.html:75 +#: templates/editorial/manage_renkans.html:78 msgid "Are you sure you want to UNPUBLISH this renkan ?" msgstr "Are you sure you want to UNPUBLISH this renkan?" -#: templates/editorial/manage_renkans.html:76 +#: templates/editorial/manage_renkans.html:79 +msgid "reject renkan" +msgstr "reject Renkan" + +#: templates/editorial/manage_renkans.html:79 msgid "Are you sure you want to REJECT this renkan ?" msgstr "Are you sure you want to REJECT this renkan?" @@ -691,19 +718,19 @@ msgid "Mot de passe (Verification)" msgstr "Password (verification)" -#: views/profile.py:423 +#: views/profile.py:427 msgid "Plus de Ressources" msgstr "More Resources" -#: views/profile.py:432 views/profile.py:511 +#: views/profile.py:436 views/profile.py:515 msgid "Period" msgstr "Period" +#~ msgid "Contact" +#~ msgstr "Contact" + #~ msgid "Pays" #~ msgstr "Countries" #~ msgid "Nuage de mots-cles" #~ msgstr "Keyword cloud" - -#~ msgid "Rechercher un tag" -#~ msgstr "Tag search" diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/locale/es/LC_MESSAGES/django.mo Binary file src/hdalab/locale/es/LC_MESSAGES/django.mo has changed diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/locale/es/LC_MESSAGES/django.po --- a/src/hdalab/locale/es/LC_MESSAGES/django.po Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/locale/es/LC_MESSAGES/django.po Thu Feb 26 10:33:10 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-18 04:16-0600\n" +"POT-Creation-Date: 2015-02-26 03:27-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,119 +41,74 @@ msgid "Japanese" msgstr "Japonés" -#: models/renkan.py:26 +#: models/renkan.py:28 msgid "edition_state" msgstr "estado_edición" -#: models/renkan.py:27 +#: models/renkan.py:29 msgid "moderated_state" msgstr "estado_moderado" -#: models/renkan.py:28 +#: models/renkan.py:30 msgid "published_state" msgstr "estado_publicado" -#: models/renkan.py:29 +#: models/renkan.py:31 msgid "rejected_state" msgstr "estado_rechazado" -#: templates/a_propos.html:5 +#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 +#: templates/base.html:95 msgid "A Propos" msgstr "Acerca de Nosotros" -#: templates/a_propos.html:13 -#: templates/contact.html:13 -#: templates/credits.html:13 -#: templates/mentions_legales.html:13 -msgid "" -"\n" -"\t\t\t\tLorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse " -"pulvinar turpis at vestibulum varius. Ut malesuada nisi nec placerat " -"gravida. Proin vitae ipsum eget urna auctor fermentum sed quis nisl. Etiam " -"placerat volutpat arcu, et vestibulum magna auctor ac. Vestibulum nisi " -"nulla, ornare ac leo sed, mollis auctor arcu. Sed sed ante laoreet, bibendum " -"libero quis, fringilla lorem. Vivamus a enim convallis, convallis nibh eget, " -"pellentesque augue. Vestibulum faucibus venenatis urna non semper. Duis " -"gravida nunc vitae nisi blandit, ut ullamcorper purus semper.\n" -"\t\t\t" -msgstr "" - -#: templates/a_propos.html:19 -#: templates/contact.html:19 -#: templates/credits.html:19 -#: templates/mentions_legales.html:19 -msgid "" -"\t\n" -"\t\t\t\tSuspendisse tempor commodo molestie. Suspendisse ultrices leo diam, " -"eget aliquet libero luctus vel. In luctus varius dolor, eget efficitur ante " -"volutpat ut. Morbi sit amet aliquet nunc. Fusce nisi sem, imperdiet ac nulla " -"quis, volutpat interdum risus. Proin faucibus vitae orci vel congue. " -"Maecenas semper non mi in gravida.\n" -"\t\t\t" +#: templates/base.html:38 +msgid "Accueil" msgstr "" -#: templates/a_propos.html:25 -#: templates/contact.html:25 -#: templates/credits.html:25 -#: templates/mentions_legales.html:25 -msgid "" -"\n" -"\t\t\t\tUt dictum nisi sed lectus lacinia scelerisque at non turpis. Integer " -"ante lacus, dictum non blandit nec, ullamcorper id lectus. Mauris quis " -"lobortis quam. Morbi tempor odio nec sodales sagittis. Nullam eu ipsum leo. " -"Aliquam rhoncus ullamcorper velit ut porta. In enim sapien, faucibus in " -"congue eu, bibendum ut sem. Mauris ultricies et odio quis fermentum. In " -"luctus augue sit amet tincidunt malesuada.\n" -"\t\t\t" +#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 +#, fuzzy +msgid "Recherche" +msgstr "Búsqueda por ramas" + +#: templates/base.html:40 templates/base.html.py:92 +#, fuzzy +msgid "Domaines Artistiques" +msgstr "Disciplinas artísticas" + +#: templates/base.html:41 templates/base.html.py:93 +msgid "Thésaurus" msgstr "" -#: templates/a_propos.html:31 -#: templates/contact.html:31 -#: templates/credits.html:31 -#: templates/mentions_legales.html:31 -msgid "" -"\n" -"\t\t\t\tNulla luctus, ante id hendrerit vehicula, lectus mi sollicitudin " -"nulla, at accumsan risus urna quis diam. Nulla at quam bibendum, condimentum " -"nunc sit amet, tristique dui. Donec in tempus risus, vel vulputate erat. " -"Nulla maximus leo a faucibus consectetur. Maecenas consequat facilisis dui " -"nec semper. Nam semper, felis sit amet egestas semper, erat velit sagittis " -"orci, sit amet ultrices ante nibh a lorem. Cras sagittis tellus nec " -"consequat maximus. Praesent sagittis ipsum augue, a posuere lectus maximus " -"ut.\n" -"\t\t\t" -msgstr "" - -#: templates/a_propos.html:37 -#: templates/contact.html:37 -#: templates/credits.html:37 -#: templates/mentions_legales.html:37 -msgid "" -"\n" -"\t\t\t\tMauris eget quam et urna consequat viverra vitae venenatis massa. " -"Vestibulum molestie porttitor sapien, eget tempus nulla. Aliquam erat " -"volutpat. Etiam sagittis dui velit, eu consequat eros varius in. Maecenas " -"tempor rhoncus ornare. Aliquam pretium malesuada leo, eget tincidunt orci " -"maximus lobortis. Aliquam sapien dolor, vulputate non bibendum vitae, " -"pellentesque quis nulla. Ut vel metus porta, molestie dui quis, sagittis " -"nibh. \n" -"\t\t\t" -msgstr "" - -#: templates/base.html:49 -#: templates/ajax_identification/ajax_login_ok.html:4 +#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 msgid "Log out" msgstr "Cerrar sesión" -#: templates/base.html:51 -#: templates/registration/activate.html:16 +#: templates/base.html:52 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "Iniciar sesión" -#: templates/categories.html:5 -#: templates/thesaurus.html:33 +#: templates/base.html:76 +#, fuzzy +msgid "Crédits" +msgstr "Creditos" + +#: templates/base.html:77 +#, fuzzy +msgid "Mentions légales" +msgstr "Aviso Legal" + +#: templates/base.html:90 +msgid "Rubriques" +msgstr "" + +#: templates/base.html:101 +msgid "Liens" +msgstr "" + +#: templates/categories.html:5 templates/thesaurus.html:33 msgid "Recherche par arbre" msgstr "Búsqueda por ramas" @@ -161,16 +116,11 @@ msgid "Explorer les domaines artistiques" msgstr "Disciplinas artísticas" -#: templates/contact.html:5 -msgid "Contact" -msgstr "Contactos" - #: templates/credits.html:5 msgid "Credits" msgstr "Creditos" -#: templates/facettes.html:5 -#: templates/facettes.html.py:44 +#: templates/facettes.html:5 templates/facettes.html.py:44 msgid "Recherche par facettes" msgstr "Búsqueda por facetas" @@ -236,10 +186,10 @@ "collections de ressources du portails histoire des arts avec d’autres sites " "Web.

Vous pouvez déplacer chaque noeud en cliquant dessus et en " "déplacant votre curseur." -msgstr "Esta erramienta (RENKAN) se permite representar, y organisar grupos " -"de recursos del portal \"Histoire des arts\" con otras parginas web." -"

Puede mover cada nudo haciendo un clic y moviendo lo" -"con su ratón." +msgstr "" +"Esta erramienta (RENKAN) se permite representar, y organisar grupos de " +"recursos del portal \"Histoire des arts\" con otras parginas web." +"

Puede mover cada nudo haciendo un clic y moviendo locon su ratón." #: templates/help_popup.html:15 msgid "Légende" @@ -257,15 +207,14 @@ msgid "Tag" msgstr "Tag" -#: templates/help_popup.html:22 -#: templates/help_popup.html.py:40 +#: templates/help_popup.html:22 templates/help_popup.html.py:40 msgid "" "En cliquant sur chaque noeud ou lien vous pouvez les déplacer, éditer, " "supprimer, agrandir, rétraicir, modifier en utilisant le menu circulaire " "comme ci dessous." -msgstr "Haciendo un clic en un nudo o un enlace, lo puede mover, editar, borrar," -"ampliar, reducir, o modificar utilizando el menu circular como lo" -"de abajo." +msgstr "" +"Haciendo un clic en un nudo o un enlace, lo puede mover, editar, borrar," +"ampliar, reducir, o modificar utilizando el menu circular como lode abajo." #: templates/help_popup.html:27 msgid "Aide : Ajouter, Editer, Organiser, Enregistrer !" @@ -279,15 +228,17 @@ msgid "" "Une fois ce didacticiel fermer vous pouvez ajouter des ressources en faisant " "“drag and drop” a partir de n’importe qu’elle fenetre de navigation web." -msgstr "Despues de cerrar esta ayuda, puede añadir recursos haciendo un\"drag and " +msgstr "" +"Despues de cerrar esta ayuda, puede añadir recursos haciendo un\"drag and " "drop\" desde cualquier pagina Web." #: templates/help_popup.html:32 msgid "" "En cliquant sur l’icone à gauche vous pouvez ouvrir le panel de recherche " "pour retrouver des ressources du site HDA ou Wikipédia." -msgstr "Haciendo un click en el icono de la izquierda, puede abrir un menu " -"de búsqueda para encontrar recursos en HDA o Wikipedia." +msgstr "" +"Haciendo un click en el icono de la izquierda, puede abrir un menu de " +"búsqueda para encontrar recursos en HDA o Wikipedia." #: templates/help_popup.html:35 msgid "2. Editer et organiser" @@ -299,7 +250,8 @@ "la mise en page avant impression.

Le Lorem Ipsum est le faux texte " "standard de l'imprimerie depuis les années 1500, quand un peintre anonyme " "assembla ensemble des morceaux de texte pour réaliser un livre de texte." -msgstr "Lorem Ipsum es simplemente el texto de relleno de las imprentas y archivosde " +msgstr "" +"Lorem Ipsum es simplemente el texto de relleno de las imprentas y archivosde " "texto.

Lorem Ipsum ha sido el texto de relleno estándar de " "lasindustrias desde el año 1500, cuando un impresor (N. del T. persona que " "se dedica a la imprenta) desconocido usó una galería de textos y los mezcló.." @@ -312,8 +264,60 @@ msgid "" "Ensuite vous pouvez enregistrer en ciquant sur l’icone representant une " "disquette." -msgstr "Luego puede guardar su trabajo haciendo un click en el icono con forma" -"de disquete." +msgstr "" +"Luego puede guardar su trabajo haciendo un click en el icono con formade " +"disquete." + +#: templates/index.html:47 +msgid "" +"Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " +"d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " +"À la fois critères " +msgstr "" + +#: templates/index.html:48 +msgid "" +"de recherche et modes de visualisation des résultats, ces différentes " +"facettes se mettent à jour au fur et à mesure de vos recherches." +msgstr "" + +#: templates/index.html:59 +msgid "Navigation à travers les Arts " +msgstr "" + +#: templates/index.html:62 +msgid "" +"Explorez 9 grands domaines artistiques à travers des arborescences enrichies " +"de ressources du portail Histoire des Arts." +msgstr "" + +#: templates/index.html:76 +msgid "" +"Construisez votre carte de connaissances à partir des ressources Histoires " +"des arts et Wikipedia." +msgstr "" + +#: templates/index.html:91 +msgid "Bienvenue sur Histoire des arts‘Lab !" +msgstr "" + +#: templates/index.html:94 +msgid "" +"Naviguez autrement à travers les 5000 ressources du Portail Histoire des " +"arts :" +msgstr "" + +#: templates/index.html:95 +msgid "Visualisez vos recherches sur une ligne du temps, une carte du monde…" +msgstr "" + +#: templates/index.html:96 +msgid "Explorez les arts de ressource en ressource" +msgstr "" + +#: templates/index.html:97 +msgid "Construisez vos cartes de connaissances" +msgstr "" #: templates/mentions_legales.html:5 msgid "Mentions legales" @@ -359,68 +363,55 @@ msgid "Nouveau Renkan" msgstr "Nuevo Renkan" -#: templates/profile_home.html:57 -#: templates/profile_home.html.py:110 -#: templates/renkan_list.html:35 -#: templates/renkan_list.html.py:73 +#: templates/profile_home.html:57 templates/profile_home.html.py:122 +#: templates/renkan_list.html:35 templates/renkan_list.html.py:77 #: templates/editorial/manage_renkans.html:30 -#: templates/editorial/manage_renkans.html:83 +#: templates/editorial/manage_renkans.html:87 msgid "Previous" msgstr "Anterior" -#: templates/profile_home.html:58 -#: templates/profile_home.html.py:111 -#: templates/renkan_list.html:36 -#: templates/renkan_list.html.py:74 +#: templates/profile_home.html:58 templates/profile_home.html.py:123 +#: templates/renkan_list.html:36 templates/renkan_list.html.py:78 #: templates/editorial/manage_renkans.html:31 -#: templates/editorial/manage_renkans.html:84 +#: templates/editorial/manage_renkans.html:88 msgid "Next" msgstr "Siguiente" -#: templates/profile_home.html:59 -#: templates/renkan_list.html:37 +#: templates/profile_home.html:59 templates/renkan_list.html:37 #: templates/editorial/manage_renkans.html:32 msgid "Filter" msgstr "Filtro" -#: templates/profile_home.html:59 -#: templates/renkan_list.html:37 +#: templates/profile_home.html:59 templates/renkan_list.html:37 #: templates/editorial/manage_renkans.html:32 msgid "Advanced search" msgstr "Búsqueda avanzada" -#: templates/profile_home.html:61 -#: templates/profile_home.html.py:78 -#: templates/renkan_list.html:39 -#: templates/renkan_list.html.py:48 +#: templates/profile_home.html:61 templates/profile_home.html.py:78 +#: templates/renkan_list.html:39 templates/renkan_list.html.py:48 #: templates/editorial/manage_renkans.html:34 #: templates/editorial/manage_renkans.html:51 msgid "Title" msgstr "Titulo" -#: templates/profile_home.html:62 -#: templates/profile_home.html.py:80 -#: templates/renkan_list.html:40 -#: templates/renkan_list.html.py:52 +#: templates/profile_home.html:62 templates/profile_home.html.py:80 +#: templates/renkan_list.html:40 templates/renkan_list.html.py:52 #: templates/editorial/manage_renkans.html:35 #: templates/editorial/manage_renkans.html:55 msgid "Modification date" msgstr "Modificar la fecha" -#: templates/profile_home.html:62 -#: templates/renkan_list.html:40 +#: templates/profile_home.html:62 templates/renkan_list.html:40 #: templates/editorial/manage_renkans.html:35 msgid "begin" msgstr "inicio" -#: templates/profile_home.html:63 -#: templates/renkan_list.html:41 +#: templates/profile_home.html:63 templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:36 msgid "end" msgstr "fin" -#: templates/profile_home.html:64 -#: templates/profile_home.html.py:83 +#: templates/profile_home.html:64 templates/profile_home.html.py:83 #: templates/editorial/manage_renkans.html:38 #: templates/editorial/manage_renkans.html:58 msgid "State" @@ -430,98 +421,100 @@ msgid "Edition" msgstr "Edición" -#: templates/profile_home.html:68 -#: templates/editorial/manage_renkans.html:41 +#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:41 msgid "Moderated" msgstr "Administrado" -#: templates/profile_home.html:69 -#: templates/editorial/manage_renkans.html:42 +#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:42 msgid "Published" msgstr "Publicado" -#: templates/profile_home.html:70 -#: templates/editorial/manage_renkans.html:43 +#: templates/profile_home.html:70 templates/editorial/manage_renkans.html:43 msgid "Rejected" msgstr "Rechazado" -#: templates/profile_home.html:73 -#: templates/renkan_list.html:43 +#: templates/profile_home.html:73 templates/renkan_list.html:43 #: templates/editorial/manage_renkans.html:46 msgid "Search" msgstr "Buscar" -#: templates/profile_home.html:82 -#: templates/editorial/manage_renkans.html:57 +#: templates/profile_home.html:82 templates/editorial/manage_renkans.html:57 msgid "Preview" msgstr "Vista previa" -#: templates/profile_home.html:85 -#: templates/editorial/manage_renkans.html:60 +#: templates/profile_home.html:85 templates/editorial/manage_renkans.html:60 msgid "Actions" msgstr "Acciones " -#: templates/profile_home.html:100 -#: templates/renkan_list.html:66 +#: templates/profile_home.html:103 templates/renkan_list.html:69 msgid "Are you sure you want to copy this renkan ?" msgstr "¿ Esta seguro que desea copiar este Renkan ?" -#: templates/profile_home.html:101 +#: templates/profile_home.html:108 +#, fuzzy +msgid "remove renkan" +msgstr "Gestionar mis Renkan" + +#: templates/profile_home.html:108 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." -msgstr "¿ Esta seguro que desea borrar este Renkan ? Esta acción es irreversible" +msgstr "" +"¿ Esta seguro que desea borrar este Renkan ? Esta acción es irreversible" -#: templates/profile_home.html:102 +#: templates/profile_home.html:113 templates/editorial/manage_renkans.html:77 +#, fuzzy +msgid "publish renkan" +msgstr "estado_publicado" + +#: templates/profile_home.html:113 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "¿ Esta seguro que desea pedir la publicación de este Renkan ?" -#: templates/profile_home.html:103 +#: templates/profile_home.html:114 templates/editorial/manage_renkans.html:78 +msgid "unpublish renkan" +msgstr "" + +#: templates/profile_home.html:114 msgid "Are you sure you want to unpublish this renkan ?" msgstr "¿ Esta seguro que desea restringir la publicación de este Renkan ?" -#: templates/renkan_edit.html:67 +#: templates/renkan_edit.html:68 msgid "Ressources" msgstr "Recursos" -#: templates/renkan_edit.html:184 +#: templates/renkan_edit.html:185 msgid "Change organisation" msgstr "Cambiar la organización" -#: templates/renkan_edit.html:185 +#: templates/renkan_edit.html:186 msgid "(Indisponible si modification du RENKAN)" msgstr "(Indisponible despues de modificar el RENKAN)" -#: templates/renkan_edit.html:188 -#: templates/renkan_edit.html.py:192 -#: templates/renkan_edit.html:196 +#: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 +#: templates/renkan_edit.html:197 msgid "View graph in column" msgstr "Vista del gráfico en columnas" -#: templates/renkan_edit.html:189 -#: templates/renkan_edit.html.py:193 -#: templates/renkan_edit.html:197 +#: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 +#: templates/renkan_edit.html:198 msgid "View graph in line" msgstr "Vista del gráfico en lineas" -#: templates/renkan_edit.html:190 -#: templates/renkan_edit.html.py:194 -#: templates/renkan_edit.html:198 +#: templates/renkan_edit.html:191 templates/renkan_edit.html.py:195 +#: templates/renkan_edit.html:199 msgid "View graph in circle" msgstr "Vista del gráfico en círculo" -#: templates/renkan_list.html:6 -#: templates/renkan_list.html.py:32 +#: templates/renkan_list.html:6 templates/renkan_list.html.py:32 msgid "Public Renkans list" msgstr "Renkan Publicos" -#: templates/renkan_list.html:42 -#: templates/editorial/manage_renkans.html:37 +#: templates/renkan_list.html:42 templates/editorial/manage_renkans.html:37 #: templates/registration/login.html:24 msgid "Username" msgstr "Nombre de Usuario" -#: templates/renkan_list.html:50 -#: templates/editorial/manage_renkans.html:53 +#: templates/renkan_list.html:50 templates/editorial/manage_renkans.html:53 msgid "User" msgstr "Usuario" @@ -550,8 +543,7 @@ msgstr "Cancelar" #: templates/ajax_identification/ajax_login.html:23 -#: templates/registration/login.html:5 -#: templates/registration/login.html:32 +#: templates/registration/login.html:5 templates/registration/login.html:32 msgid "Login" msgstr "Iniciar Sesión" @@ -569,15 +561,20 @@ msgid "Manage renkan publication" msgstr "Gestionar la publicación de Renkan" -#: templates/editorial/manage_renkans.html:74 +#: templates/editorial/manage_renkans.html:77 msgid "Are you sure you want to PUBLISH this renkan ?" msgstr "¿ Esta seguro que desea PUBLICAR este Renkan ?" -#: templates/editorial/manage_renkans.html:75 +#: templates/editorial/manage_renkans.html:78 msgid "Are you sure you want to UNPUBLISH this renkan ?" msgstr "¿ Esta seguro que desea RESTRINGIR la publicación de este Renkan ?" -#: templates/editorial/manage_renkans.html:76 +#: templates/editorial/manage_renkans.html:79 +#, fuzzy +msgid "reject renkan" +msgstr "Gestionar mis Renkan" + +#: templates/editorial/manage_renkans.html:79 msgid "Are you sure you want to REJECT this renkan ?" msgstr "¿ Esta seguro que desea RECHAZAR este Renkan ?" @@ -729,11 +726,13 @@ msgid "Mot de passe (Verification)" msgstr "Contraseña (verificación)" -#: views/profile.py:423 +#: views/profile.py:427 msgid "Plus de Ressources" msgstr "Mas recursos" -#: views/profile.py:421 -#: views/profile.py:487 +#: views/profile.py:436 views/profile.py:515 msgid "Period" msgstr "Periodo" + +#~ msgid "Contact" +#~ msgstr "Contactos" diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/locale/fr/LC_MESSAGES/django.mo Binary file src/hdalab/locale/fr/LC_MESSAGES/django.mo has changed diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/locale/fr/LC_MESSAGES/django.po --- a/src/hdalab/locale/fr/LC_MESSAGES/django.po Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/locale/fr/LC_MESSAGES/django.po Thu Feb 26 10:33:10 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-18 19:35-0600\n" +"POT-Creation-Date: 2015-02-26 03:27-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,105 +41,69 @@ msgid "Japanese" msgstr "Japonais" -#: models/renkan.py:26 +#: models/renkan.py:28 msgid "edition_state" msgstr "édition" -#: models/renkan.py:27 +#: models/renkan.py:29 msgid "moderated_state" msgstr "modéré" -#: models/renkan.py:28 +#: models/renkan.py:30 msgid "published_state" msgstr "publié" -#: models/renkan.py:29 +#: models/renkan.py:31 msgid "rejected_state" msgstr "rejeté" -#: templates/a_propos.html:5 +#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 +#: templates/base.html:95 msgid "A Propos" msgstr "À Propos" -#: templates/a_propos.html:13 templates/contact.html:13 -#: templates/credits.html:13 templates/mentions_legales.html:13 -msgid "" -"\n" -"\t\t\t\tLorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse " -"pulvinar turpis at vestibulum varius. Ut malesuada nisi nec placerat " -"gravida. Proin vitae ipsum eget urna auctor fermentum sed quis nisl. Etiam " -"placerat volutpat arcu, et vestibulum magna auctor ac. Vestibulum nisi " -"nulla, ornare ac leo sed, mollis auctor arcu. Sed sed ante laoreet, bibendum " -"libero quis, fringilla lorem. Vivamus a enim convallis, convallis nibh eget, " -"pellentesque augue. Vestibulum faucibus venenatis urna non semper. Duis " -"gravida nunc vitae nisi blandit, ut ullamcorper purus semper.\n" -"\t\t\t" -msgstr "" - -#: templates/a_propos.html:19 templates/contact.html:19 -#: templates/credits.html:19 templates/mentions_legales.html:19 -msgid "" -"\t\n" -"\t\t\t\tSuspendisse tempor commodo molestie. Suspendisse ultrices leo diam, " -"eget aliquet libero luctus vel. In luctus varius dolor, eget efficitur ante " -"volutpat ut. Morbi sit amet aliquet nunc. Fusce nisi sem, imperdiet ac nulla " -"quis, volutpat interdum risus. Proin faucibus vitae orci vel congue. " -"Maecenas semper non mi in gravida.\n" -"\t\t\t" +#: templates/base.html:38 +msgid "Accueil" msgstr "" -#: templates/a_propos.html:25 templates/contact.html:25 -#: templates/credits.html:25 templates/mentions_legales.html:25 -msgid "" -"\n" -"\t\t\t\tUt dictum nisi sed lectus lacinia scelerisque at non turpis. Integer " -"ante lacus, dictum non blandit nec, ullamcorper id lectus. Mauris quis " -"lobortis quam. Morbi tempor odio nec sodales sagittis. Nullam eu ipsum leo. " -"Aliquam rhoncus ullamcorper velit ut porta. In enim sapien, faucibus in " -"congue eu, bibendum ut sem. Mauris ultricies et odio quis fermentum. In " -"luctus augue sit amet tincidunt malesuada.\n" -"\t\t\t" +#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 +msgid "Recherche" +msgstr "Recherche par arbre" + +#: templates/base.html:40 templates/base.html.py:92 +msgid "Domaines Artistiques" +msgstr "Disciplines artistiques" + +#: templates/base.html:41 templates/base.html.py:93 +msgid "Thésaurus" msgstr "" -#: templates/a_propos.html:31 templates/contact.html:31 -#: templates/credits.html:31 templates/mentions_legales.html:31 -msgid "" -"\n" -"\t\t\t\tNulla luctus, ante id hendrerit vehicula, lectus mi sollicitudin " -"nulla, at accumsan risus urna quis diam. Nulla at quam bibendum, condimentum " -"nunc sit amet, tristique dui. Donec in tempus risus, vel vulputate erat. " -"Nulla maximus leo a faucibus consectetur. Maecenas consequat facilisis dui " -"nec semper. Nam semper, felis sit amet egestas semper, erat velit sagittis " -"orci, sit amet ultrices ante nibh a lorem. Cras sagittis tellus nec " -"consequat maximus. Praesent sagittis ipsum augue, a posuere lectus maximus " -"ut.\n" -"\t\t\t" -msgstr "" - -#: templates/a_propos.html:37 templates/contact.html:37 -#: templates/credits.html:37 templates/mentions_legales.html:37 -msgid "" -"\n" -"\t\t\t\tMauris eget quam et urna consequat viverra vitae venenatis massa. " -"Vestibulum molestie porttitor sapien, eget tempus nulla. Aliquam erat " -"volutpat. Etiam sagittis dui velit, eu consequat eros varius in. Maecenas " -"tempor rhoncus ornare. Aliquam pretium malesuada leo, eget tincidunt orci " -"maximus lobortis. Aliquam sapien dolor, vulputate non bibendum vitae, " -"pellentesque quis nulla. Ut vel metus porta, molestie dui quis, sagittis " -"nibh. \n" -"\t\t\t" -msgstr "" - -#: templates/base.html:49 templates/ajax_identification/ajax_login_ok.html:4 +#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 msgid "Log out" msgstr "Déconnexion" -#: templates/base.html:51 templates/registration/activate.html:16 +#: templates/base.html:52 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "Connexion" +#: templates/base.html:76 +msgid "Crédits" +msgstr "Crédits" + +#: templates/base.html:77 +msgid "Mentions légales" +msgstr "Mentions légales" + +#: templates/base.html:90 +msgid "Rubriques" +msgstr "Rubriques" + +#: templates/base.html:101 +msgid "Liens" +msgstr "Liens" + #: templates/categories.html:5 templates/thesaurus.html:33 msgid "Recherche par arbre" msgstr "Recherche par arbre" @@ -148,10 +112,6 @@ msgid "Explorer les domaines artistiques" msgstr "Explorer les domaines artistiques" -#: templates/contact.html:5 -msgid "Contact" -msgstr "Contact" - #: templates/credits.html:5 msgid "Credits" msgstr "Crédits" @@ -306,6 +266,66 @@ "Ensuite vous pouvez enregistrer en ciquant sur l’icone representant une " "disquette." +#: templates/index.html:47 +msgid "" +"Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " +"d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " +"À la fois critères " +msgstr "" +"Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " +"d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " +"À la fois critères " + +#: templates/index.html:48 +msgid "" +"de recherche et modes de visualisation des résultats, ces différentes " +"facettes se mettent à jour au fur et à mesure de vos recherches." +msgstr "" +"de recherche et modes de visualisation des résultats, ces différentes " +"facettes se mettent à jour au fur et à mesure de vos recherches." + +#: templates/index.html:59 +msgid "Navigation à travers les Arts " +msgstr "Navigation à travers les Arts " + +#: templates/index.html:62 +msgid "" +"Explorez 9 grands domaines artistiques à travers des arborescences enrichies " +"de ressources du portail Histoire des Arts." +msgstr "" + +#: templates/index.html:76 +msgid "" +"Construisez votre carte de connaissances à partir des ressources Histoires " +"des arts et Wikipedia." +msgstr "" +"Construisez votre carte de connaissances à partir des ressources Histoires " +"des arts et Wikipedia." + +#: templates/index.html:91 +msgid "Bienvenue sur Histoire des arts‘Lab !" +msgstr "Bienvenue sur Histoire des arts‘Lab !" + +#: templates/index.html:94 +msgid "" +"Naviguez autrement à travers les 5000 ressources du Portail Histoire des " +"arts :" +msgstr "" +"Naviguez autrement à travers les 5000 ressources du Portail Histoire des " +"arts :" + +#: templates/index.html:95 +msgid "Visualisez vos recherches sur une ligne du temps, une carte du monde…" +msgstr "Visualisez vos recherches sur une ligne du temps, une carte du monde…" + +#: templates/index.html:96 +msgid "Explorez les arts de ressource en ressource" +msgstr "Explorez les arts de ressource en ressource" + +#: templates/index.html:97 +msgid "Construisez vos cartes de connaissances" +msgstr "Construisez vos cartes de connaissances" + #: templates/mentions_legales.html:5 msgid "Mentions legales" msgstr "Mentions légales" @@ -350,17 +370,17 @@ msgid "Nouveau Renkan" msgstr "Nouveau Renkan" -#: templates/profile_home.html:57 templates/profile_home.html.py:110 -#: templates/renkan_list.html:35 templates/renkan_list.html.py:73 +#: templates/profile_home.html:57 templates/profile_home.html.py:122 +#: templates/renkan_list.html:35 templates/renkan_list.html.py:77 #: templates/editorial/manage_renkans.html:30 -#: templates/editorial/manage_renkans.html:83 +#: templates/editorial/manage_renkans.html:87 msgid "Previous" msgstr "Précédent" -#: templates/profile_home.html:58 templates/profile_home.html.py:111 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:74 +#: templates/profile_home.html:58 templates/profile_home.html.py:123 +#: templates/renkan_list.html:36 templates/renkan_list.html.py:78 #: templates/editorial/manage_renkans.html:31 -#: templates/editorial/manage_renkans.html:84 +#: templates/editorial/manage_renkans.html:88 msgid "Next" msgstr "Suivant" @@ -433,49 +453,61 @@ msgid "Actions" msgstr "Actions" -#: templates/profile_home.html:100 templates/renkan_list.html:66 +#: templates/profile_home.html:103 templates/renkan_list.html:69 msgid "Are you sure you want to copy this renkan ?" msgstr "Êtes-vous certain(e) de vouloir copier ce Renkan ?" -#: templates/profile_home.html:101 +#: templates/profile_home.html:108 +msgid "remove renkan" +msgstr "Effacer Renkan" + +#: templates/profile_home.html:108 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" "Êtes-vous certain(e) de vouloir effacer ce Renkan ? Vous ne pourrez pas " "annuler cette action." -#: templates/profile_home.html:102 +#: templates/profile_home.html:113 templates/editorial/manage_renkans.html:77 +msgid "publish renkan" +msgstr "publier renkan" + +#: templates/profile_home.html:113 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "Êtes-vous certain(e) de vouloir demander la publication de ce Renkan ?" -#: templates/profile_home.html:103 +#: templates/profile_home.html:114 templates/editorial/manage_renkans.html:78 +msgid "unpublish renkan" +msgstr "dépublier renkan" + +#: templates/profile_home.html:114 msgid "Are you sure you want to unpublish this renkan ?" msgstr "Êtes-vous certain(e) de vouloir dépublier ce Renkan ?" -#: templates/renkan_edit.html:67 +#: templates/renkan_edit.html:68 msgid "Ressources" msgstr "Ressources" -#: templates/renkan_edit.html:184 +#: templates/renkan_edit.html:185 msgid "Change organisation" msgstr "Changer de disposition" -#: templates/renkan_edit.html:185 +#: templates/renkan_edit.html:186 msgid "(Indisponible si modification du RENKAN)" msgstr "(Indisponible si le RENKAN est modifié)" -#: templates/renkan_edit.html:188 templates/renkan_edit.html.py:192 -#: templates/renkan_edit.html:196 +#: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 +#: templates/renkan_edit.html:197 msgid "View graph in column" msgstr "Voir le graphe en colonne" -#: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 -#: templates/renkan_edit.html:197 +#: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 +#: templates/renkan_edit.html:198 msgid "View graph in line" msgstr "Voir le graphe en ligne" -#: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 -#: templates/renkan_edit.html:198 +#: templates/renkan_edit.html:191 templates/renkan_edit.html.py:195 +#: templates/renkan_edit.html:199 msgid "View graph in circle" msgstr "Voir le graphe en cercle" @@ -536,15 +568,19 @@ msgid "Manage renkan publication" msgstr "Gérer les publications de Renkan" -#: templates/editorial/manage_renkans.html:74 +#: templates/editorial/manage_renkans.html:77 msgid "Are you sure you want to PUBLISH this renkan ?" msgstr "Êtes-vous certain(e) de vouloir PUBLIER ce Renkan ?" -#: templates/editorial/manage_renkans.html:75 +#: templates/editorial/manage_renkans.html:78 msgid "Are you sure you want to UNPUBLISH this renkan ?" msgstr "Êtes-vous certain(e) de vouloir DÉPUBLIER ce Renkan ?" -#: templates/editorial/manage_renkans.html:76 +#: templates/editorial/manage_renkans.html:79 +msgid "reject renkan" +msgstr "rejeter Renkan" + +#: templates/editorial/manage_renkans.html:79 msgid "Are you sure you want to REJECT this renkan ?" msgstr "Êtes-vous certain(e) de vouloir REJETER ce Renkan ?" @@ -698,10 +734,13 @@ msgid "Mot de passe (Verification)" msgstr "Mot de passe (vérification)" -#: views/profile.py:423 +#: views/profile.py:427 msgid "Plus de Ressources" msgstr "Plus de Ressources" -#: views/profile.py:432 views/profile.py:511 +#: views/profile.py:436 views/profile.py:515 msgid "Period" msgstr "Période" + +#~ msgid "Contact" +#~ msgstr "Contact" diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/locale/it/LC_MESSAGES/django.mo Binary file src/hdalab/locale/it/LC_MESSAGES/django.mo has changed diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/locale/it/LC_MESSAGES/django.po --- a/src/hdalab/locale/it/LC_MESSAGES/django.po Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/locale/it/LC_MESSAGES/django.po Thu Feb 26 10:33:10 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-18 19:35-0600\n" +"POT-Creation-Date: 2015-02-26 03:27-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,105 +41,71 @@ msgid "Japanese" msgstr "Giapponese" -#: models/renkan.py:26 +#: models/renkan.py:28 msgid "edition_state" msgstr "" -#: models/renkan.py:27 +#: models/renkan.py:29 msgid "moderated_state" msgstr "" -#: models/renkan.py:28 +#: models/renkan.py:30 msgid "published_state" msgstr "" -#: models/renkan.py:29 +#: models/renkan.py:31 msgid "rejected_state" msgstr "" -#: templates/a_propos.html:5 +#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 +#: templates/base.html:95 msgid "A Propos" msgstr "" -#: templates/a_propos.html:13 templates/contact.html:13 -#: templates/credits.html:13 templates/mentions_legales.html:13 -msgid "" -"\n" -"\t\t\t\tLorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse " -"pulvinar turpis at vestibulum varius. Ut malesuada nisi nec placerat " -"gravida. Proin vitae ipsum eget urna auctor fermentum sed quis nisl. Etiam " -"placerat volutpat arcu, et vestibulum magna auctor ac. Vestibulum nisi " -"nulla, ornare ac leo sed, mollis auctor arcu. Sed sed ante laoreet, bibendum " -"libero quis, fringilla lorem. Vivamus a enim convallis, convallis nibh eget, " -"pellentesque augue. Vestibulum faucibus venenatis urna non semper. Duis " -"gravida nunc vitae nisi blandit, ut ullamcorper purus semper.\n" -"\t\t\t" -msgstr "" - -#: templates/a_propos.html:19 templates/contact.html:19 -#: templates/credits.html:19 templates/mentions_legales.html:19 -msgid "" -"\t\n" -"\t\t\t\tSuspendisse tempor commodo molestie. Suspendisse ultrices leo diam, " -"eget aliquet libero luctus vel. In luctus varius dolor, eget efficitur ante " -"volutpat ut. Morbi sit amet aliquet nunc. Fusce nisi sem, imperdiet ac nulla " -"quis, volutpat interdum risus. Proin faucibus vitae orci vel congue. " -"Maecenas semper non mi in gravida.\n" -"\t\t\t" +#: templates/base.html:38 +msgid "Accueil" msgstr "" -#: templates/a_propos.html:25 templates/contact.html:25 -#: templates/credits.html:25 templates/mentions_legales.html:25 -msgid "" -"\n" -"\t\t\t\tUt dictum nisi sed lectus lacinia scelerisque at non turpis. Integer " -"ante lacus, dictum non blandit nec, ullamcorper id lectus. Mauris quis " -"lobortis quam. Morbi tempor odio nec sodales sagittis. Nullam eu ipsum leo. " -"Aliquam rhoncus ullamcorper velit ut porta. In enim sapien, faucibus in " -"congue eu, bibendum ut sem. Mauris ultricies et odio quis fermentum. In " -"luctus augue sit amet tincidunt malesuada.\n" -"\t\t\t" +#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 +#, fuzzy +msgid "Recherche" +msgstr "Cercare un tag" + +#: templates/base.html:40 templates/base.html.py:92 +#, fuzzy +msgid "Domaines Artistiques" +msgstr "Discipline artistiche" + +#: templates/base.html:41 templates/base.html.py:93 +msgid "Thésaurus" msgstr "" -#: templates/a_propos.html:31 templates/contact.html:31 -#: templates/credits.html:31 templates/mentions_legales.html:31 -msgid "" -"\n" -"\t\t\t\tNulla luctus, ante id hendrerit vehicula, lectus mi sollicitudin " -"nulla, at accumsan risus urna quis diam. Nulla at quam bibendum, condimentum " -"nunc sit amet, tristique dui. Donec in tempus risus, vel vulputate erat. " -"Nulla maximus leo a faucibus consectetur. Maecenas consequat facilisis dui " -"nec semper. Nam semper, felis sit amet egestas semper, erat velit sagittis " -"orci, sit amet ultrices ante nibh a lorem. Cras sagittis tellus nec " -"consequat maximus. Praesent sagittis ipsum augue, a posuere lectus maximus " -"ut.\n" -"\t\t\t" -msgstr "" - -#: templates/a_propos.html:37 templates/contact.html:37 -#: templates/credits.html:37 templates/mentions_legales.html:37 -msgid "" -"\n" -"\t\t\t\tMauris eget quam et urna consequat viverra vitae venenatis massa. " -"Vestibulum molestie porttitor sapien, eget tempus nulla. Aliquam erat " -"volutpat. Etiam sagittis dui velit, eu consequat eros varius in. Maecenas " -"tempor rhoncus ornare. Aliquam pretium malesuada leo, eget tincidunt orci " -"maximus lobortis. Aliquam sapien dolor, vulputate non bibendum vitae, " -"pellentesque quis nulla. Ut vel metus porta, molestie dui quis, sagittis " -"nibh. \n" -"\t\t\t" -msgstr "" - -#: templates/base.html:49 templates/ajax_identification/ajax_login_ok.html:4 +#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 msgid "Log out" msgstr "" -#: templates/base.html:51 templates/registration/activate.html:16 +#: templates/base.html:52 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "" +#: templates/base.html:76 +msgid "Crédits" +msgstr "" + +#: templates/base.html:77 +msgid "Mentions légales" +msgstr "" + +#: templates/base.html:90 +msgid "Rubriques" +msgstr "" + +#: templates/base.html:101 +msgid "Liens" +msgstr "" + #: templates/categories.html:5 templates/thesaurus.html:33 #, fuzzy msgid "Recherche par arbre" @@ -150,10 +116,6 @@ msgid "Explorer les domaines artistiques" msgstr "Discipline artistiche" -#: templates/contact.html:5 -msgid "Contact" -msgstr "" - #: templates/credits.html:5 msgid "Credits" msgstr "" @@ -292,6 +254,57 @@ "disquette." msgstr "" +#: templates/index.html:47 +msgid "" +"Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " +"d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " +"À la fois critères " +msgstr "" + +#: templates/index.html:48 +msgid "" +"de recherche et modes de visualisation des résultats, ces différentes " +"facettes se mettent à jour au fur et à mesure de vos recherches." +msgstr "" + +#: templates/index.html:59 +msgid "Navigation à travers les Arts " +msgstr "" + +#: templates/index.html:62 +msgid "" +"Explorez 9 grands domaines artistiques à travers des arborescences enrichies " +"de ressources du portail Histoire des Arts." +msgstr "" + +#: templates/index.html:76 +msgid "" +"Construisez votre carte de connaissances à partir des ressources Histoires " +"des arts et Wikipedia." +msgstr "" + +#: templates/index.html:91 +msgid "Bienvenue sur Histoire des arts‘Lab !" +msgstr "" + +#: templates/index.html:94 +msgid "" +"Naviguez autrement à travers les 5000 ressources du Portail Histoire des " +"arts :" +msgstr "" + +#: templates/index.html:95 +msgid "Visualisez vos recherches sur une ligne du temps, une carte du monde…" +msgstr "" + +#: templates/index.html:96 +msgid "Explorez les arts de ressource en ressource" +msgstr "" + +#: templates/index.html:97 +msgid "Construisez vos cartes de connaissances" +msgstr "" + #: templates/mentions_legales.html:5 msgid "Mentions legales" msgstr "" @@ -336,17 +349,17 @@ msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:57 templates/profile_home.html.py:110 -#: templates/renkan_list.html:35 templates/renkan_list.html.py:73 +#: templates/profile_home.html:57 templates/profile_home.html.py:122 +#: templates/renkan_list.html:35 templates/renkan_list.html.py:77 #: templates/editorial/manage_renkans.html:30 -#: templates/editorial/manage_renkans.html:83 +#: templates/editorial/manage_renkans.html:87 msgid "Previous" msgstr "" -#: templates/profile_home.html:58 templates/profile_home.html.py:111 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:74 +#: templates/profile_home.html:58 templates/profile_home.html.py:123 +#: templates/renkan_list.html:36 templates/renkan_list.html.py:78 #: templates/editorial/manage_renkans.html:31 -#: templates/editorial/manage_renkans.html:84 +#: templates/editorial/manage_renkans.html:88 msgid "Next" msgstr "" @@ -420,47 +433,59 @@ msgid "Actions" msgstr "" -#: templates/profile_home.html:100 templates/renkan_list.html:66 +#: templates/profile_home.html:103 templates/renkan_list.html:69 msgid "Are you sure you want to copy this renkan ?" msgstr "" -#: templates/profile_home.html:101 +#: templates/profile_home.html:108 +msgid "remove renkan" +msgstr "" + +#: templates/profile_home.html:108 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:102 +#: templates/profile_home.html:113 templates/editorial/manage_renkans.html:77 +msgid "publish renkan" +msgstr "" + +#: templates/profile_home.html:113 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:103 +#: templates/profile_home.html:114 templates/editorial/manage_renkans.html:78 +msgid "unpublish renkan" +msgstr "" + +#: templates/profile_home.html:114 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" -#: templates/renkan_edit.html:67 +#: templates/renkan_edit.html:68 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:184 +#: templates/renkan_edit.html:185 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:185 +#: templates/renkan_edit.html:186 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:188 templates/renkan_edit.html.py:192 -#: templates/renkan_edit.html:196 -msgid "View graph in column" -msgstr "" - #: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 #: templates/renkan_edit.html:197 -msgid "View graph in line" +msgid "View graph in column" msgstr "" #: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 #: templates/renkan_edit.html:198 +msgid "View graph in line" +msgstr "" + +#: templates/renkan_edit.html:191 templates/renkan_edit.html.py:195 +#: templates/renkan_edit.html:199 msgid "View graph in circle" msgstr "" @@ -520,15 +545,19 @@ msgid "Manage renkan publication" msgstr "" -#: templates/editorial/manage_renkans.html:74 +#: templates/editorial/manage_renkans.html:77 msgid "Are you sure you want to PUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:75 +#: templates/editorial/manage_renkans.html:78 msgid "Are you sure you want to UNPUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:76 +#: templates/editorial/manage_renkans.html:79 +msgid "reject renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:79 msgid "Are you sure you want to REJECT this renkan ?" msgstr "" @@ -680,11 +709,11 @@ msgid "Mot de passe (Verification)" msgstr "" -#: views/profile.py:423 +#: views/profile.py:427 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:432 views/profile.py:511 +#: views/profile.py:436 views/profile.py:515 msgid "Period" msgstr "" @@ -694,9 +723,6 @@ #~ msgid "Nuage de mots-cles" #~ msgstr "Nucleo di parole chiave" -#~ msgid "Rechercher un tag" -#~ msgstr "Cercare un tag" - #~ msgid "Chinese" #~ msgstr "Cinese" diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/locale/ja/LC_MESSAGES/django.mo Binary file src/hdalab/locale/ja/LC_MESSAGES/django.mo has changed diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/locale/ja/LC_MESSAGES/django.po --- a/src/hdalab/locale/ja/LC_MESSAGES/django.po Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/locale/ja/LC_MESSAGES/django.po Thu Feb 26 10:33:10 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-18 19:35-0600\n" +"POT-Creation-Date: 2015-02-26 03:27-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -42,105 +42,71 @@ msgid "Japanese" msgstr "日本語" -#: models/renkan.py:26 +#: models/renkan.py:28 msgid "edition_state" msgstr "" -#: models/renkan.py:27 +#: models/renkan.py:29 msgid "moderated_state" msgstr "" -#: models/renkan.py:28 +#: models/renkan.py:30 msgid "published_state" msgstr "" -#: models/renkan.py:29 +#: models/renkan.py:31 msgid "rejected_state" msgstr "" -#: templates/a_propos.html:5 +#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 +#: templates/base.html:95 msgid "A Propos" msgstr "" -#: templates/a_propos.html:13 templates/contact.html:13 -#: templates/credits.html:13 templates/mentions_legales.html:13 -msgid "" -"\n" -"\t\t\t\tLorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse " -"pulvinar turpis at vestibulum varius. Ut malesuada nisi nec placerat " -"gravida. Proin vitae ipsum eget urna auctor fermentum sed quis nisl. Etiam " -"placerat volutpat arcu, et vestibulum magna auctor ac. Vestibulum nisi " -"nulla, ornare ac leo sed, mollis auctor arcu. Sed sed ante laoreet, bibendum " -"libero quis, fringilla lorem. Vivamus a enim convallis, convallis nibh eget, " -"pellentesque augue. Vestibulum faucibus venenatis urna non semper. Duis " -"gravida nunc vitae nisi blandit, ut ullamcorper purus semper.\n" -"\t\t\t" -msgstr "" - -#: templates/a_propos.html:19 templates/contact.html:19 -#: templates/credits.html:19 templates/mentions_legales.html:19 -msgid "" -"\t\n" -"\t\t\t\tSuspendisse tempor commodo molestie. Suspendisse ultrices leo diam, " -"eget aliquet libero luctus vel. In luctus varius dolor, eget efficitur ante " -"volutpat ut. Morbi sit amet aliquet nunc. Fusce nisi sem, imperdiet ac nulla " -"quis, volutpat interdum risus. Proin faucibus vitae orci vel congue. " -"Maecenas semper non mi in gravida.\n" -"\t\t\t" +#: templates/base.html:38 +msgid "Accueil" msgstr "" -#: templates/a_propos.html:25 templates/contact.html:25 -#: templates/credits.html:25 templates/mentions_legales.html:25 -msgid "" -"\n" -"\t\t\t\tUt dictum nisi sed lectus lacinia scelerisque at non turpis. Integer " -"ante lacus, dictum non blandit nec, ullamcorper id lectus. Mauris quis " -"lobortis quam. Morbi tempor odio nec sodales sagittis. Nullam eu ipsum leo. " -"Aliquam rhoncus ullamcorper velit ut porta. In enim sapien, faucibus in " -"congue eu, bibendum ut sem. Mauris ultricies et odio quis fermentum. In " -"luctus augue sit amet tincidunt malesuada.\n" -"\t\t\t" +#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 +#, fuzzy +msgid "Recherche" +msgstr "タグを検索する" + +#: templates/base.html:40 templates/base.html.py:92 +#, fuzzy +msgid "Domaines Artistiques" +msgstr "学術・芸術分野" + +#: templates/base.html:41 templates/base.html.py:93 +msgid "Thésaurus" msgstr "" -#: templates/a_propos.html:31 templates/contact.html:31 -#: templates/credits.html:31 templates/mentions_legales.html:31 -msgid "" -"\n" -"\t\t\t\tNulla luctus, ante id hendrerit vehicula, lectus mi sollicitudin " -"nulla, at accumsan risus urna quis diam. Nulla at quam bibendum, condimentum " -"nunc sit amet, tristique dui. Donec in tempus risus, vel vulputate erat. " -"Nulla maximus leo a faucibus consectetur. Maecenas consequat facilisis dui " -"nec semper. Nam semper, felis sit amet egestas semper, erat velit sagittis " -"orci, sit amet ultrices ante nibh a lorem. Cras sagittis tellus nec " -"consequat maximus. Praesent sagittis ipsum augue, a posuere lectus maximus " -"ut.\n" -"\t\t\t" -msgstr "" - -#: templates/a_propos.html:37 templates/contact.html:37 -#: templates/credits.html:37 templates/mentions_legales.html:37 -msgid "" -"\n" -"\t\t\t\tMauris eget quam et urna consequat viverra vitae venenatis massa. " -"Vestibulum molestie porttitor sapien, eget tempus nulla. Aliquam erat " -"volutpat. Etiam sagittis dui velit, eu consequat eros varius in. Maecenas " -"tempor rhoncus ornare. Aliquam pretium malesuada leo, eget tincidunt orci " -"maximus lobortis. Aliquam sapien dolor, vulputate non bibendum vitae, " -"pellentesque quis nulla. Ut vel metus porta, molestie dui quis, sagittis " -"nibh. \n" -"\t\t\t" -msgstr "" - -#: templates/base.html:49 templates/ajax_identification/ajax_login_ok.html:4 +#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 msgid "Log out" msgstr "" -#: templates/base.html:51 templates/registration/activate.html:16 +#: templates/base.html:52 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "" +#: templates/base.html:76 +msgid "Crédits" +msgstr "" + +#: templates/base.html:77 +msgid "Mentions légales" +msgstr "" + +#: templates/base.html:90 +msgid "Rubriques" +msgstr "" + +#: templates/base.html:101 +msgid "Liens" +msgstr "" + #: templates/categories.html:5 templates/thesaurus.html:33 #, fuzzy msgid "Recherche par arbre" @@ -151,10 +117,6 @@ msgid "Explorer les domaines artistiques" msgstr "学術・芸術分野" -#: templates/contact.html:5 -msgid "Contact" -msgstr "" - #: templates/credits.html:5 msgid "Credits" msgstr "" @@ -293,6 +255,57 @@ "disquette." msgstr "" +#: templates/index.html:47 +msgid "" +"Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " +"d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " +"À la fois critères " +msgstr "" + +#: templates/index.html:48 +msgid "" +"de recherche et modes de visualisation des résultats, ces différentes " +"facettes se mettent à jour au fur et à mesure de vos recherches." +msgstr "" + +#: templates/index.html:59 +msgid "Navigation à travers les Arts " +msgstr "" + +#: templates/index.html:62 +msgid "" +"Explorez 9 grands domaines artistiques à travers des arborescences enrichies " +"de ressources du portail Histoire des Arts." +msgstr "" + +#: templates/index.html:76 +msgid "" +"Construisez votre carte de connaissances à partir des ressources Histoires " +"des arts et Wikipedia." +msgstr "" + +#: templates/index.html:91 +msgid "Bienvenue sur Histoire des arts‘Lab !" +msgstr "" + +#: templates/index.html:94 +msgid "" +"Naviguez autrement à travers les 5000 ressources du Portail Histoire des " +"arts :" +msgstr "" + +#: templates/index.html:95 +msgid "Visualisez vos recherches sur une ligne du temps, une carte du monde…" +msgstr "" + +#: templates/index.html:96 +msgid "Explorez les arts de ressource en ressource" +msgstr "" + +#: templates/index.html:97 +msgid "Construisez vos cartes de connaissances" +msgstr "" + #: templates/mentions_legales.html:5 msgid "Mentions legales" msgstr "" @@ -337,17 +350,17 @@ msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:57 templates/profile_home.html.py:110 -#: templates/renkan_list.html:35 templates/renkan_list.html.py:73 +#: templates/profile_home.html:57 templates/profile_home.html.py:122 +#: templates/renkan_list.html:35 templates/renkan_list.html.py:77 #: templates/editorial/manage_renkans.html:30 -#: templates/editorial/manage_renkans.html:83 +#: templates/editorial/manage_renkans.html:87 msgid "Previous" msgstr "" -#: templates/profile_home.html:58 templates/profile_home.html.py:111 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:74 +#: templates/profile_home.html:58 templates/profile_home.html.py:123 +#: templates/renkan_list.html:36 templates/renkan_list.html.py:78 #: templates/editorial/manage_renkans.html:31 -#: templates/editorial/manage_renkans.html:84 +#: templates/editorial/manage_renkans.html:88 msgid "Next" msgstr "" @@ -421,47 +434,59 @@ msgid "Actions" msgstr "" -#: templates/profile_home.html:100 templates/renkan_list.html:66 +#: templates/profile_home.html:103 templates/renkan_list.html:69 msgid "Are you sure you want to copy this renkan ?" msgstr "" -#: templates/profile_home.html:101 +#: templates/profile_home.html:108 +msgid "remove renkan" +msgstr "" + +#: templates/profile_home.html:108 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:102 +#: templates/profile_home.html:113 templates/editorial/manage_renkans.html:77 +msgid "publish renkan" +msgstr "" + +#: templates/profile_home.html:113 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:103 +#: templates/profile_home.html:114 templates/editorial/manage_renkans.html:78 +msgid "unpublish renkan" +msgstr "" + +#: templates/profile_home.html:114 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" -#: templates/renkan_edit.html:67 +#: templates/renkan_edit.html:68 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:184 +#: templates/renkan_edit.html:185 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:185 +#: templates/renkan_edit.html:186 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:188 templates/renkan_edit.html.py:192 -#: templates/renkan_edit.html:196 -msgid "View graph in column" -msgstr "" - #: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 #: templates/renkan_edit.html:197 -msgid "View graph in line" +msgid "View graph in column" msgstr "" #: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 #: templates/renkan_edit.html:198 +msgid "View graph in line" +msgstr "" + +#: templates/renkan_edit.html:191 templates/renkan_edit.html.py:195 +#: templates/renkan_edit.html:199 msgid "View graph in circle" msgstr "" @@ -521,15 +546,19 @@ msgid "Manage renkan publication" msgstr "" -#: templates/editorial/manage_renkans.html:74 +#: templates/editorial/manage_renkans.html:77 msgid "Are you sure you want to PUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:75 +#: templates/editorial/manage_renkans.html:78 msgid "Are you sure you want to UNPUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:76 +#: templates/editorial/manage_renkans.html:79 +msgid "reject renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:79 msgid "Are you sure you want to REJECT this renkan ?" msgstr "" @@ -681,11 +710,11 @@ msgid "Mot de passe (Verification)" msgstr "" -#: views/profile.py:423 +#: views/profile.py:427 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:432 views/profile.py:511 +#: views/profile.py:436 views/profile.py:515 msgid "Period" msgstr "" @@ -695,9 +724,6 @@ #~ msgid "Nuage de mots-cles" #~ msgstr "キーワードクラウド" -#~ msgid "Rechercher un tag" -#~ msgstr "タグを検索する" - #~ msgid "Chinese" #~ msgstr "中国語" diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo Binary file src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo has changed diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/locale/zh-tw/LC_MESSAGES/django.po --- a/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Thu Feb 26 10:33:10 2015 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-18 19:35-0600\n" +"POT-Creation-Date: 2015-02-26 03:27-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -42,105 +42,71 @@ msgid "Japanese" msgstr "" -#: models/renkan.py:26 +#: models/renkan.py:28 msgid "edition_state" msgstr "" -#: models/renkan.py:27 +#: models/renkan.py:29 msgid "moderated_state" msgstr "" -#: models/renkan.py:28 +#: models/renkan.py:30 msgid "published_state" msgstr "" -#: models/renkan.py:29 +#: models/renkan.py:31 msgid "rejected_state" msgstr "" -#: templates/a_propos.html:5 +#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 +#: templates/base.html:95 msgid "A Propos" msgstr "" -#: templates/a_propos.html:13 templates/contact.html:13 -#: templates/credits.html:13 templates/mentions_legales.html:13 -msgid "" -"\n" -"\t\t\t\tLorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse " -"pulvinar turpis at vestibulum varius. Ut malesuada nisi nec placerat " -"gravida. Proin vitae ipsum eget urna auctor fermentum sed quis nisl. Etiam " -"placerat volutpat arcu, et vestibulum magna auctor ac. Vestibulum nisi " -"nulla, ornare ac leo sed, mollis auctor arcu. Sed sed ante laoreet, bibendum " -"libero quis, fringilla lorem. Vivamus a enim convallis, convallis nibh eget, " -"pellentesque augue. Vestibulum faucibus venenatis urna non semper. Duis " -"gravida nunc vitae nisi blandit, ut ullamcorper purus semper.\n" -"\t\t\t" -msgstr "" - -#: templates/a_propos.html:19 templates/contact.html:19 -#: templates/credits.html:19 templates/mentions_legales.html:19 -msgid "" -"\t\n" -"\t\t\t\tSuspendisse tempor commodo molestie. Suspendisse ultrices leo diam, " -"eget aliquet libero luctus vel. In luctus varius dolor, eget efficitur ante " -"volutpat ut. Morbi sit amet aliquet nunc. Fusce nisi sem, imperdiet ac nulla " -"quis, volutpat interdum risus. Proin faucibus vitae orci vel congue. " -"Maecenas semper non mi in gravida.\n" -"\t\t\t" +#: templates/base.html:38 +msgid "Accueil" msgstr "" -#: templates/a_propos.html:25 templates/contact.html:25 -#: templates/credits.html:25 templates/mentions_legales.html:25 -msgid "" -"\n" -"\t\t\t\tUt dictum nisi sed lectus lacinia scelerisque at non turpis. Integer " -"ante lacus, dictum non blandit nec, ullamcorper id lectus. Mauris quis " -"lobortis quam. Morbi tempor odio nec sodales sagittis. Nullam eu ipsum leo. " -"Aliquam rhoncus ullamcorper velit ut porta. In enim sapien, faucibus in " -"congue eu, bibendum ut sem. Mauris ultricies et odio quis fermentum. In " -"luctus augue sit amet tincidunt malesuada.\n" -"\t\t\t" +#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 +#, fuzzy +msgid "Recherche" +msgstr "Rechercher un tag" + +#: templates/base.html:40 templates/base.html.py:92 +#, fuzzy +msgid "Domaines Artistiques" +msgstr "Disciplines artistiques" + +#: templates/base.html:41 templates/base.html.py:93 +msgid "Thésaurus" msgstr "" -#: templates/a_propos.html:31 templates/contact.html:31 -#: templates/credits.html:31 templates/mentions_legales.html:31 -msgid "" -"\n" -"\t\t\t\tNulla luctus, ante id hendrerit vehicula, lectus mi sollicitudin " -"nulla, at accumsan risus urna quis diam. Nulla at quam bibendum, condimentum " -"nunc sit amet, tristique dui. Donec in tempus risus, vel vulputate erat. " -"Nulla maximus leo a faucibus consectetur. Maecenas consequat facilisis dui " -"nec semper. Nam semper, felis sit amet egestas semper, erat velit sagittis " -"orci, sit amet ultrices ante nibh a lorem. Cras sagittis tellus nec " -"consequat maximus. Praesent sagittis ipsum augue, a posuere lectus maximus " -"ut.\n" -"\t\t\t" -msgstr "" - -#: templates/a_propos.html:37 templates/contact.html:37 -#: templates/credits.html:37 templates/mentions_legales.html:37 -msgid "" -"\n" -"\t\t\t\tMauris eget quam et urna consequat viverra vitae venenatis massa. " -"Vestibulum molestie porttitor sapien, eget tempus nulla. Aliquam erat " -"volutpat. Etiam sagittis dui velit, eu consequat eros varius in. Maecenas " -"tempor rhoncus ornare. Aliquam pretium malesuada leo, eget tincidunt orci " -"maximus lobortis. Aliquam sapien dolor, vulputate non bibendum vitae, " -"pellentesque quis nulla. Ut vel metus porta, molestie dui quis, sagittis " -"nibh. \n" -"\t\t\t" -msgstr "" - -#: templates/base.html:49 templates/ajax_identification/ajax_login_ok.html:4 +#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 msgid "Log out" msgstr "" -#: templates/base.html:51 templates/registration/activate.html:16 +#: templates/base.html:52 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "" +#: templates/base.html:76 +msgid "Crédits" +msgstr "" + +#: templates/base.html:77 +msgid "Mentions légales" +msgstr "" + +#: templates/base.html:90 +msgid "Rubriques" +msgstr "" + +#: templates/base.html:101 +msgid "Liens" +msgstr "" + #: templates/categories.html:5 templates/thesaurus.html:33 #, fuzzy msgid "Recherche par arbre" @@ -151,10 +117,6 @@ msgid "Explorer les domaines artistiques" msgstr "Disciplines artistiques" -#: templates/contact.html:5 -msgid "Contact" -msgstr "" - #: templates/credits.html:5 msgid "Credits" msgstr "" @@ -293,6 +255,57 @@ "disquette." msgstr "" +#: templates/index.html:47 +msgid "" +"Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " +"d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " +"À la fois critères " +msgstr "" + +#: templates/index.html:48 +msgid "" +"de recherche et modes de visualisation des résultats, ces différentes " +"facettes se mettent à jour au fur et à mesure de vos recherches." +msgstr "" + +#: templates/index.html:59 +msgid "Navigation à travers les Arts " +msgstr "" + +#: templates/index.html:62 +msgid "" +"Explorez 9 grands domaines artistiques à travers des arborescences enrichies " +"de ressources du portail Histoire des Arts." +msgstr "" + +#: templates/index.html:76 +msgid "" +"Construisez votre carte de connaissances à partir des ressources Histoires " +"des arts et Wikipedia." +msgstr "" + +#: templates/index.html:91 +msgid "Bienvenue sur Histoire des arts‘Lab !" +msgstr "" + +#: templates/index.html:94 +msgid "" +"Naviguez autrement à travers les 5000 ressources du Portail Histoire des " +"arts :" +msgstr "" + +#: templates/index.html:95 +msgid "Visualisez vos recherches sur une ligne du temps, une carte du monde…" +msgstr "" + +#: templates/index.html:96 +msgid "Explorez les arts de ressource en ressource" +msgstr "" + +#: templates/index.html:97 +msgid "Construisez vos cartes de connaissances" +msgstr "" + #: templates/mentions_legales.html:5 msgid "Mentions legales" msgstr "" @@ -337,17 +350,17 @@ msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:57 templates/profile_home.html.py:110 -#: templates/renkan_list.html:35 templates/renkan_list.html.py:73 +#: templates/profile_home.html:57 templates/profile_home.html.py:122 +#: templates/renkan_list.html:35 templates/renkan_list.html.py:77 #: templates/editorial/manage_renkans.html:30 -#: templates/editorial/manage_renkans.html:83 +#: templates/editorial/manage_renkans.html:87 msgid "Previous" msgstr "" -#: templates/profile_home.html:58 templates/profile_home.html.py:111 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:74 +#: templates/profile_home.html:58 templates/profile_home.html.py:123 +#: templates/renkan_list.html:36 templates/renkan_list.html.py:78 #: templates/editorial/manage_renkans.html:31 -#: templates/editorial/manage_renkans.html:84 +#: templates/editorial/manage_renkans.html:88 msgid "Next" msgstr "" @@ -421,47 +434,59 @@ msgid "Actions" msgstr "" -#: templates/profile_home.html:100 templates/renkan_list.html:66 +#: templates/profile_home.html:103 templates/renkan_list.html:69 msgid "Are you sure you want to copy this renkan ?" msgstr "" -#: templates/profile_home.html:101 +#: templates/profile_home.html:108 +msgid "remove renkan" +msgstr "" + +#: templates/profile_home.html:108 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:102 +#: templates/profile_home.html:113 templates/editorial/manage_renkans.html:77 +msgid "publish renkan" +msgstr "" + +#: templates/profile_home.html:113 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:103 +#: templates/profile_home.html:114 templates/editorial/manage_renkans.html:78 +msgid "unpublish renkan" +msgstr "" + +#: templates/profile_home.html:114 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" -#: templates/renkan_edit.html:67 +#: templates/renkan_edit.html:68 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:184 +#: templates/renkan_edit.html:185 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:185 +#: templates/renkan_edit.html:186 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:188 templates/renkan_edit.html.py:192 -#: templates/renkan_edit.html:196 -msgid "View graph in column" -msgstr "" - #: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 #: templates/renkan_edit.html:197 -msgid "View graph in line" +msgid "View graph in column" msgstr "" #: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 #: templates/renkan_edit.html:198 +msgid "View graph in line" +msgstr "" + +#: templates/renkan_edit.html:191 templates/renkan_edit.html.py:195 +#: templates/renkan_edit.html:199 msgid "View graph in circle" msgstr "" @@ -521,15 +546,19 @@ msgid "Manage renkan publication" msgstr "" -#: templates/editorial/manage_renkans.html:74 +#: templates/editorial/manage_renkans.html:77 msgid "Are you sure you want to PUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:75 +#: templates/editorial/manage_renkans.html:78 msgid "Are you sure you want to UNPUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:76 +#: templates/editorial/manage_renkans.html:79 +msgid "reject renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:79 msgid "Are you sure you want to REJECT this renkan ?" msgstr "" @@ -681,11 +710,11 @@ msgid "Mot de passe (Verification)" msgstr "" -#: views/profile.py:423 +#: views/profile.py:427 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:432 views/profile.py:511 +#: views/profile.py:436 views/profile.py:515 msgid "Period" msgstr "" @@ -695,9 +724,6 @@ #~ msgid "Nuage de mots-cles" #~ msgstr "Nuage de mots-clés" -#~ msgid "Rechercher un tag" -#~ msgstr "Rechercher un tag" - #~ msgid "Partager la session" #~ msgstr "Partager la session" diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/migrations/0001_initial.py --- a/src/hdalab/migrations/0001_initial.py Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/migrations/0001_initial.py Thu Feb 26 10:33:10 2015 +0100 @@ -3,6 +3,10 @@ from south.v2 import SchemaMigration class Migration(SchemaMigration): + + depends_on = ( + ("hdabo", "0007_auto__add_folder"), + ) def forwards(self, orm): diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/migrations/0013_auto__chg_field_dbpediafields_tag__add_unique_tagyears_tag.py --- a/src/hdalab/migrations/0013_auto__chg_field_dbpediafields_tag__add_unique_tagyears_tag.py Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/migrations/0013_auto__chg_field_dbpediafields_tag__add_unique_tagyears_tag.py Thu Feb 26 10:33:10 2015 +0100 @@ -5,6 +5,10 @@ class Migration(SchemaMigration): + depends_on = ( + ("hdabo", "0007_auto__add_folder"), + ) + def forwards(self, orm): # Changing field 'DbpediaFields.tag' diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/migrations/0014_auto__add_hdalabrenkanstatetransition__chg_field_dbpediafields_tag.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/migrations/0014_auto__add_hdalabrenkanstatetransition__chg_field_dbpediafields_tag.py Thu Feb 26 10:33:10 2015 +0100 @@ -0,0 +1,341 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'HdalabRenkanStateTransition' + db.create_table(u'hdalab_hdalabrenkanstatetransition', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('renkan', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdalab.HdalabRenkan'])), + ('from_state', self.gf('django.db.models.fields.IntegerField')(default=1)), + ('to_state', self.gf('django.db.models.fields.IntegerField')(default=1)), + ('ts', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('message', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), + ('author', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.User'])), + )) + db.send_create_signal('hdalab', ['HdalabRenkanStateTransition']) + + def backwards(self, orm): + # Deleting model 'HdalabRenkanStateTransition' + db.delete_table(u'hdalab_hdalabrenkanstatetransition') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'hdabo.author': { + 'Meta': {'object_name': 'Author'}, + 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), + 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) + }, + u'hdabo.datasheet': { + 'Meta': {'object_name': 'Datasheet'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), + 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), + 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), + 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), + 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), + 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), + 'original_creation_date': ('django.db.models.fields.DateField', [], {}), + 'original_modification_date': ('django.db.models.fields.DateField', [], {}), + 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), + 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), + 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), + 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), + 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) + }, + u'hdabo.datasheet_college_periods': { + 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sort_value': ('django.db.models.fields.IntegerField', [], {}), + 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) + }, + u'hdabo.datasheet_college_themes': { + 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sort_value': ('django.db.models.fields.IntegerField', [], {}) + }, + u'hdabo.datasheet_domains': { + 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sort_value': ('django.db.models.fields.IntegerField', [], {}) + }, + u'hdabo.datasheet_highschool_periods': { + 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sort_value': ('django.db.models.fields.IntegerField', [], {}), + 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) + }, + u'hdabo.datasheet_highschool_themes': { + 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sort_value': ('django.db.models.fields.IntegerField', [], {}) + }, + u'hdabo.datasheet_primary_periods': { + 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sort_value': ('django.db.models.fields.IntegerField', [], {}), + 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) + }, + u'hdabo.datasheet_primary_themes': { + 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sort_value': ('django.db.models.fields.IntegerField', [], {}) + }, + u'hdabo.documentformat': { + 'Meta': {'object_name': 'DocumentFormat'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) + }, + u'hdabo.domain': { + 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), + 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'school_period': ('django.db.models.fields.IntegerField', [], {}) + }, + u'hdabo.location': { + 'Meta': {'object_name': 'Location'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) + }, + u'hdabo.organisation': { + 'Meta': {'object_name': 'Organisation'}, + 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), + 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) + }, + u'hdabo.tag': { + 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, + 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), + 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), + 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '7168', 'db_index': 'True'}), + 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), + 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), + 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), + 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), + 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) + }, + u'hdabo.tagcategory': { + 'Meta': {'object_name': 'TagCategory'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}) + }, + u'hdabo.taggedsheet': { + 'Meta': {'object_name': 'TaggedSheet'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), + 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), + 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + u'hdabo.timeperiod': { + 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), + 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'school_period': ('django.db.models.fields.IntegerField', [], {}) + }, + u'hdabo.user': { + 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'hdalab.country': { + 'Meta': {'object_name': 'Country'}, + 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'hdalab.datasheetextras': { + 'Meta': {'object_name': 'DatasheetExtras'}, + 'datasheet': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'extras'", 'unique': 'True', 'to': u"orm['hdabo.Datasheet']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'insee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.InseeCoords']", 'null': 'True', 'blank': 'True'}) + }, + 'hdalab.dbpediafields': { + 'Meta': {'object_name': 'DbpediaFields'}, + 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), + 'tag': ('hdalab.fields.OneToOneField', [], {'related_name': "'dbpedia_fields'", 'unique': 'True', 'related_default': None, 'to': u"orm['hdabo.Tag']"}), + 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) + }, + 'hdalab.dbpediafieldstranslation': { + 'Meta': {'unique_together': "(('master', 'language_code'),)", 'object_name': 'DbpediaFieldsTranslation'}, + 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_abstract_translated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_label_translated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}), + 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), + 'master': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': "orm['hdalab.DbpediaFields']"}) + }, + 'hdalab.geoinclusion': { + 'Meta': {'object_name': 'GeoInclusion'}, + 'country': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'includes'", 'to': "orm['hdalab.Country']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'locatedin'", 'unique': 'True', 'to': u"orm['hdabo.Tag']"}) + }, + 'hdalab.hdalabrenkan': { + 'Meta': {'object_name': 'HdalabRenkan'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'renkan': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['renkanmanager.Renkan']"}), + 'state': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + }, + 'hdalab.hdalabrenkanstatetransition': { + 'Meta': {'object_name': 'HdalabRenkanStateTransition'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']"}), + 'from_state': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'renkan': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.HdalabRenkan']"}), + 'to_state': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'ts': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + 'hdalab.hdasession': { + 'Meta': {'object_name': 'HdaSession'}, + 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) + }, + 'hdalab.infoboxparameter': { + 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), + 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) + }, + 'hdalab.inseecoords': { + 'Meta': {'object_name': 'InseeCoords'}, + 'city_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'insee': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}), + 'latitude': ('django.db.models.fields.FloatField', [], {}), + 'longitude': ('django.db.models.fields.FloatField', [], {}) + }, + 'hdalab.taginfobox': { + 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), + 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), + 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': u"orm['hdabo.Tag']"}) + }, + 'hdalab.taglinks': { + 'Meta': {'object_name': 'TagLinks'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': u"orm['hdabo.Tag']"}), + 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': u"orm['hdabo.Tag']"}) + }, + 'hdalab.tagwpcategory': { + 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, + 'hidden': ('django.db.models.fields.BooleanField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': u"orm['hdabo.Tag']"}), + 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tags'", 'to': "orm['hdalab.WpCategory']"}) + }, + 'hdalab.tagyears': { + 'Meta': {'object_name': 'TagYears'}, + 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'unique': 'True', 'to': u"orm['hdabo.Tag']"}) + }, + 'hdalab.wpcategory': { + 'Meta': {'object_name': 'WpCategory'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) + }, + 'hdalab.wpcategoryinclusion': { + 'Meta': {'unique_together': "(('parent_category', 'child_category'),)", 'object_name': 'WpCategoryInclusion'}, + 'child_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parent_categories'", 'to': "orm['hdalab.WpCategory']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'parent_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'child_categories'", 'to': "orm['hdalab.WpCategory']"}) + }, + 'renkanmanager.renkan': { + 'Meta': {'object_name': 'Renkan'}, + 'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'default': "'thumbnails/renkan/renkan_default_icon.png'", 'max_length': '100'}), + 'modification_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}), + 'rk_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True'}) + } + } + + complete_apps = ['hdalab'] \ No newline at end of file diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/models/__init__.py --- a/src/hdalab/models/__init__.py Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/models/__init__.py Thu Feb 26 10:33:10 2015 +0100 @@ -1,6 +1,6 @@ from hdalab.models.categories import (WpCategory, InfoboxParameter, TagInfobox, TagWpCategory, WpCategoryInclusion) from hdalab.models.dataviz import TagYears, Country, GeoInclusion, TagLinks, DbpediaFields, HdaSession, InseeCoords, DatasheetExtras, DbpediaFieldsTranslation -from hdalab.models.renkan import HdalabRenkan +from hdalab.models.renkan import HdalabRenkan, HdalabRenkanStateTransition -__all__ = ['WpCategory', 'InfoboxParameter', 'TagInfobox', 'TagWpCategory', 'TagYears', 'Country', 'GeoInclusion', 'TagLinks', 'DbpediaFields', 'DbpediaFieldsTranslation', 'HdaSession', 'InseeCoords', 'DatasheetExtras', 'WpCategoryInclusion', 'HdalabRenkan'] \ No newline at end of file +__all__ = ['WpCategory', 'InfoboxParameter', 'TagInfobox', 'TagWpCategory', 'TagYears', 'Country', 'GeoInclusion', 'TagLinks', 'DbpediaFields', 'DbpediaFieldsTranslation', 'HdaSession', 'InseeCoords', 'DatasheetExtras', 'WpCategoryInclusion', 'HdalabRenkan', 'HdalabRenkanStateTransition'] \ No newline at end of file diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/models/renkan.py --- a/src/hdalab/models/renkan.py Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/models/renkan.py Thu Feb 26 10:33:10 2015 +0100 @@ -3,9 +3,11 @@ @author: tc ''' +from renkanmanager.models import Renkan + +from django.conf import settings from django.db import models from django.utils.translation import ugettext as _ -from renkanmanager.models import Renkan class HdalabRenkan(models.Model): @@ -34,3 +36,16 @@ class Meta: app_label = 'hdalab' + + +class HdalabRenkanStateTransition(models.Model): + + renkan = models.ForeignKey(HdalabRenkan, blank=False, null=False) + from_state = models.IntegerField(choices=HdalabRenkan.STATE_CHOICES, default=1, blank=False, null=False) + to_state = models.IntegerField(choices=HdalabRenkan.STATE_CHOICES, default=1, blank=False, null=False) + ts = models.DateTimeField(auto_now_add=True, blank=False, null=False) + message = models.TextField(blank=True, null=True) + author = models.ForeignKey(settings.AUTH_USER_MODEL, blank=False, null=False) + + class Meta: + app_label = 'hdalab' diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/services.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/services.py Thu Feb 26 10:33:10 2015 +0100 @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +''' +Created on Feb 22, 2015 + +@author: ymh +''' +from django.db import transaction +from hdalab.models.renkan import HdalabRenkanStateTransition + +@transaction.atomic +def change_renkan_state(hda_renkan, state, message=None, author=None): + + if state != hda_renkan.state: + + HdalabRenkanStateTransition.objects.create(renkan=hda_renkan, from_state=hda_renkan.state, to_state=state, message=message, author=author) + hda_renkan.state = state + hda_renkan.save() \ No newline at end of file diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/settings.py --- a/src/hdalab/settings.py Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/settings.py Thu Feb 26 10:33:10 2015 +0100 @@ -140,6 +140,7 @@ INSTALLED_APPS = ( 'south', 'hdalab', + 'hdabo', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', @@ -151,7 +152,6 @@ 'registration', 'haystack', 'easy_thumbnails', - 'hdabo', 'renkanmanager', ) diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/static/hdalab/css/profile.css --- a/src/hdalab/static/hdalab/css/profile.css Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/static/hdalab/css/profile.css Thu Feb 26 10:33:10 2015 +0100 @@ -1,67 +1,97 @@ -p{ - font-size: 16px; - margin: 10px 10px 0; +p { + font-size: 16px; + margin: 10px 10px 0; } -h2{ - font-size:18px + +h2 { + font-size: 18px } -table{ - font-size: 14px; - width: 100%; + +table { + font-size: 14px; + width: 100%; } -tr{ - text-align: left; + +tr { + text-align: left; } + tr.border_bottom th, tr.border_bottom td { - border-bottom:1pt solid #555; + border-bottom: 1pt solid #555; padding: 5px; } + th a { float: left; } -.renkan-basic-action{ - float: left; - margin-right: 5px; + +.renkan-basic-action { + float: left; + margin-right: 5px; } -.ui-icon-eye { - background-position: -160px -144px; + +button.renkan-basic-action { + margin : 0; + padding : 0; + border : 0; + background : transparent; + font-family : inherit; + cursor : pointer; } -.inline{ - display: inline-block; + +button.renkan-basic-action::-moz-focus-inner{ + padding : 0; + border : 0; +} + +.ui-icon-eye { + background-position: -160px -144px; } -#advanced-form{ - border-bottom:1pt solid #555; - border-top:1pt solid #555; + +.inline { + display: inline-block; } -#advanced-form p{ - font-size: 12px; + +#advanced-form { + border-bottom: 1pt solid #555; + border-top: 1pt solid #555; +} + +#advanced-form p { + font-size: 12px; } /* editorialisation part */ .hand_cursor { - cursor: pointer; + cursor: pointer; +} + +.folder-input { + width: 500px; +} + +textarea.folder-input { + height: 120px; +} + +.remove-ds-from-folder { + font-weight: bold; + color: #50a4a3; } -.folder-input{ - width: 500px; +.remove-ds-from-folder:hover { + color: #4F5155; } -textarea.folder-input{ - height: 120px; -} -.remove-ds-from-folder{ - font-weight: bold; - color: #50a4a3; + +td.list { + padding-left: 18px !important; } -.remove-ds-from-folder:hover{ - color: #4F5155; -} -td.list{ - padding-left: 18px !important; + +li.edito { + margin-top: 10px; } -li.edito{ - margin-top: 10px; -} -.sub-content{ - padding: 20px 0; - border-top: 1px solid #b0b0b0; + +.sub-content { + padding: 20px 0; + border-top: 1px solid #b0b0b0; } \ No newline at end of file diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/templates/base.html --- a/src/hdalab/templates/base.html Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/templates/base.html Thu Feb 26 10:33:10 2015 +0100 @@ -24,88 +24,90 @@ {% block header %} - {% endblock %}
- {% block main_content %} - {% endblock %} + {% block main_content %} + {% endblock %}
{% block footer %} - + {% endblock %} {% analytics %} diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/templates/editorial/manage_renkans.html --- a/src/hdalab/templates/editorial/manage_renkans.html Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/templates/editorial/manage_renkans.html Thu Feb 26 10:33:10 2015 +0100 @@ -71,9 +71,13 @@ {{ hr.state|state_to_str }} - {% if hr.state == 2 or hr.state == 4 %} - {% else %}{% endif %} - {% if hr.state != 4 %}{% endif %} +
+ {% csrf_token %} + + {% if hr.state == 2 or hr.state == 4 %} + {% else %}{% endif %} + {% if hr.state != 4 %}{% endif %} +
{% endwith %} diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/templates/index.html --- a/src/hdalab/templates/index.html Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/templates/index.html Thu Feb 26 10:33:10 2015 +0100 @@ -27,9 +27,9 @@ return false; }); $(".bloc").mouseleave(function() { - $(".overlay-bloc").each(function() { - $(this).slideUp(); - }); + $(".overlay-bloc").each(function() { + $(this).slideUp(); + }); }); }); @@ -39,46 +39,46 @@ {% block subhead %}
-
-
-

{% trans 'Recherche' %}

-
-
-

{% blocktrans %}Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. À la fois critères {% endblocktrans %}

-

{% blocktrans %}de recherche et modes de visualisation des résultats, ces différentes facettes se mettent à jour au fur et à mesure de vos recherches.{% endblocktrans %}

-

»

-
-
-
+
+
+

{% trans 'Recherche' %}

+
+
+

{% blocktrans %}Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. À la fois critères {% endblocktrans %}

+

{% blocktrans %}de recherche et modes de visualisation des résultats, ces différentes facettes se mettent à jour au fur et à mesure de vos recherches.{% endblocktrans %}

+

»

+
+
+
-
-
-

{% trans 'Navigation à travers les Arts ' %}

-
-
-

{% blocktrans %}Explorez 9 grands domaines artistiques à travers des arborescences enrichies de ressources du portail Histoire des Arts.{% endblocktrans %}

-

»

-
-
-
+
+
+

{% trans 'Navigation à travers les Arts ' %}

+
+
+

{% blocktrans %}Explorez 9 grands domaines artistiques à travers des arborescences enrichies de ressources du portail Histoire des Arts.{% endblocktrans %}

+

»

+
+
+
-
-
-

Renkan

-
-
-

{% blocktrans %}Construisez votre carte de connaissances à partir des ressources Histoires des arts et Wikipedia.{% endblocktrans %}

-

»

-
-
-
-
+
+
+

Renkan

+
+
+

{% blocktrans %}Construisez votre carte de connaissances à partir des ressources Histoires des arts et Wikipedia.{% endblocktrans %}

+

»

+
+
+
+
@@ -87,16 +87,16 @@ {% block main_content %} -
-

{% blocktrans %}Bienvenue sur Histoire des arts‘Lab !{% endblocktrans %}

-
-
-
    {% blocktrans %}Naviguez autrement à travers les 5000 ressources du Portail Histoire des arts :{% endblocktrans %} -
  • {% blocktrans %}Visualisez vos recherches sur une ligne du temps, une carte du monde…{% endblocktrans %}
    • -
  • {% blocktrans %}Explorez les arts de ressource en ressource{% endblocktrans %}
    • -
  • {% blocktrans %}Construisez vos cartes de connaissances{% endblocktrans %}
    • -
+
+

{% blocktrans %}Bienvenue sur Histoire des arts‘Lab !{% endblocktrans %}

+
+
+
    {% blocktrans %}Naviguez autrement à travers les 5000 ressources du Portail Histoire des arts :{% endblocktrans %} +
  • {% blocktrans %}Visualisez vos recherches sur une ligne du temps, une carte du monde…{% endblocktrans %}
    • +
  • {% blocktrans %}Explorez les arts de ressource en ressource{% endblocktrans %}
    • +
  • {% blocktrans %}Construisez vos cartes de connaissances{% endblocktrans %}
    • +
-
+
{% endblock %} \ No newline at end of file diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/templates/profile_home.html --- a/src/hdalab/templates/profile_home.html Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/templates/profile_home.html Thu Feb 26 10:33:10 2015 +0100 @@ -30,84 +30,96 @@ {% block main_content %}
-

{% trans 'Mon profil' %}

-
- {% if user.is_staff %} -
-

/ {% trans 'Adminsitration du Site' %}

-

- {% trans 'Administrer les Renkan' %} - / {% trans 'Editorialisation' %} - / {% trans 'Administration Hdalab' %} - / {% trans 'Administrer Hdabo' %} -

-
- {% endif %} -
-

/ {% trans 'Modifier mon profil' %}

-

- Modification du mot de passe -

-
-
-

/ {% trans 'Gerer mes Renkan' %}

-

- {% trans 'Nouveau Renkan' %} -

-

{% if page.has_previous %}{% trans 'Previous' %}{% endif %} - {% if page.has_previous and page.has_next %} - {% endif %}{% if page.has_next %}{% trans 'Next' %}{% endif %}

-

{% if page.has_previous or page.has_next %} - {% endif %}{% trans 'Filter' %} : - {% trans 'Advanced search' %}

-
-

{% trans 'Title' %} :

-

{% trans 'Modification date' %} : {% trans 'begin' %} - - {% trans 'end' %} :

-

{% trans 'State' %} : - -

-

-
- - - - - - - - - - - - {% for hr in page.object_list %} - {% with hr.renkan as r %} - - - - - - - - {% endwith %} - {% endfor %} - -
{% trans 'Title' %} - {% if sort_param == 'title' %}{% endif %}{% trans 'Modification date' %} - {% if sort_param == 'date' %}{% endif %}{% trans 'Preview' %}{% trans 'State' %} - {% if sort_param == 'state' %}{% endif %}{% trans 'Actions' %}
{{ r.title }}{{ r.modification_date|date:"Y-m-d H:i" }}{% thumbnail r.image 100x100 as thumb %}{{ hr.state|state_to_str }} - {% if hr.state == 1 %} - {% else %}{% endif %} - - - - {% if hr.state == 1 %} - {% else %}{% endif %} -
-

{% if page.has_previous %}{% trans 'Previous' %}{% endif %} - {% if page.has_previous and page.has_next %} - {% endif %}{% if page.has_next %}{% trans 'Next' %}{% endif %}

-
+

{% trans 'Mon profil' %}

+
+ {% if user.is_staff %} +
+

/ {% trans 'Adminsitration du Site' %}

+

+ {% trans 'Administrer les Renkan' %} + / {% trans 'Editorialisation' %} + / {% trans 'Administration Hdalab' %} + / {% trans 'Administrer Hdabo' %} +

+
+ {% endif %} +
+

/ {% trans 'Modifier mon profil' %}

+

+ Modification du mot de passe +

+
+
+

/ {% trans 'Gerer mes Renkan' %}

+

+ {% trans 'Nouveau Renkan' %} +

+

{% if page.has_previous %}{% trans 'Previous' %}{% endif %} + {% if page.has_previous and page.has_next %} - {% endif %}{% if page.has_next %}{% trans 'Next' %}{% endif %}

+

{% if page.has_previous or page.has_next %} - {% endif %}{% trans 'Filter' %} : - {% trans 'Advanced search' %}

+
+

{% trans 'Title' %} :

+

{% trans 'Modification date' %} : {% trans 'begin' %} - + {% trans 'end' %} :

+

{% trans 'State' %} : + +

+

+
+ + + + + + + + + + + + {% for hr in page.object_list %} + {% with hr.renkan as r %} + + + + + + + + {% endwith %} + {% endfor %} + +
{% trans 'Title' %} + {% if sort_param == 'title' %}{% endif %}{% trans 'Modification date' %} + {% if sort_param == 'date' %}{% endif %}{% trans 'Preview' %}{% trans 'State' %} + {% if sort_param == 'state' %}{% endif %}{% trans 'Actions' %}
{{ r.title }}{{ r.modification_date|date:"Y-m-d H:i" }}{% thumbnail r.image 100x100 as thumb %}{{ hr.state|state_to_str }} + {% if hr.state == 1 %} + {% else %}{% endif %} + +
+ {% csrf_token %} + + +
+
+ {% csrf_token %} + + +
+
+ {% csrf_token %} + + {% if hr.state == 1 %} + {% else %}{% endif %} +
+
+

{% if page.has_previous %}{% trans 'Previous' %}{% endif %} + {% if page.has_previous and page.has_next %} - {% endif %}{% if page.has_next %}{% trans 'Next' %}{% endif %}

+
{% endblock %} \ No newline at end of file diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/templates/renkan_list.html --- a/src/hdalab/templates/renkan_list.html Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/templates/renkan_list.html Thu Feb 26 10:33:10 2015 +0100 @@ -63,7 +63,11 @@ {% thumbnail r.image 100x100 as thumb %} - +
+ {% csrf_token %} + + +
{% endwith %} diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/urls.py --- a/src/hdalab/urls.py Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/urls.py Thu Feb 26 10:33:10 2015 +0100 @@ -42,7 +42,8 @@ url(r'^renkan/view/$', TemplateView.as_view(template_name="renkan_view.html"), name='renkan_view'), url(r'^renkan/copy/(?P.*)$', login_required(HdalabRenkanCopy.as_view()), name='renkan_copy'), url(r'^renkan/delete/(?P.*)$', login_required(HdalabRenkanDelete.as_view()), name='renkan_delete'), - url(r'^renkan/moderate/(?P.*)/(?P.*)$', login_required(HdalabRenkanModerate.as_view()), name='renkan_moderate'), + #url(r'^renkan/moderate/(?P.*)/(?P.*)$', login_required(HdalabRenkanModerate.as_view()), name='renkan_moderate'), + url(r'^renkan/moderate/(?P.*)$', login_required(HdalabRenkanModerate.as_view()), name='renkan_moderate'), url(r'^profile/$', login_required(ProfileHome.as_view()), name='profile_home'), url(r'^renkan/public/$', RenkanPublicList.as_view(), name='renkan_public_list'), url(r'^ajaxlogin/$', "hdalab.views.profile.ajax_login", name='ajax_login'), diff -r 1121fd3d8b0e -r 604b887e70c3 src/hdalab/views/profile.py --- a/src/hdalab/views/profile.py Thu Feb 26 15:51:03 2015 +0100 +++ b/src/hdalab/views/profile.py Thu Feb 26 10:33:10 2015 +0100 @@ -38,6 +38,10 @@ import uuid import logging +from django.views.generic.edit import ModelFormMixin +from hdalab.forms import HdalabRenkanStateForm +from django.contrib.admin.models import CHANGE +from hdalab.services import change_renkan_state logger = logging.getLogger(__name__) @@ -117,7 +121,7 @@ return self.update_context( super(RenkanPublicList, self).get_context_data(**kwargs), HdalabRenkan.objects.select_related("renkan", "renkan__owner").filter(state=HdalabRenkan.PUBLISHED) ) - +#TODO transform in post class RenkanNew(View): def get(self, request): @@ -617,53 +621,49 @@ - class HdalabRenkanCopy(View): - def get(self, request, rk_id): + def post(self, request, rk_id): rk = renkan_copier(request.user, rk_id) hr = HdalabRenkan() hr.renkan = rk hr.state = HdalabRenkan.EDITION hr.save() - if "next" in request.GET: - return redirect(request.GET["next"]) + if "next" in request.POST: + return redirect(request.POST["next"]) return redirect(reverse('profile_home')) - class HdalabRenkanDelete(View): - def get(self, request, rk_id): + def post(self, request, rk_id): try: hr = HdalabRenkan.objects.get(renkan__rk_id=rk_id) except: raise Http404('Renkan not found') renkan_deleter(request.user, rk_id) hr.delete() - if "next" in request.GET: - return redirect(request.GET["next"]) + if "next" in request.POST: + return redirect(request.POST["next"]) return redirect(reverse('profile_home')) - -class HdalabRenkanModerate(View): +class HdalabRenkanModerate(View, ModelFormMixin): - def get(self, request, rk_id, state): - if rk_id!="": - try: - hr = HdalabRenkan.objects.select_related("renkan", "renkan__owner").get(renkan__rk_id=rk_id) - except: - raise Http404('Renkan not found') - if hr.renkan.owner!=request.user and not request.user.is_staff: - return HttpResponseBadRequest("You are not allowed to modify the state this renkan.") - hr.state = state - hr.save() - - if "next" in request.GET: - return redirect(request.GET["next"]) - - return redirect(reverse('profile_home')) + def post(self, request, rk_id): + form = HdalabRenkanStateForm(request.POST) + if form.is_valid(): + logger.debug("FORM DATA %r", form.cleaned_data) + renkan_hda = get_object_or_404(HdalabRenkan, renkan__rk_id=rk_id) + change_renkan_state(renkan_hda, form.cleaned_data['state'], form.cleaned_data['message'], request.user) + next_url = form.cleaned_data.get('next', None) + if next_url: + return redirect(next_url) + else: + redirect(reverse('profile_home')) + else: + logger.debug("FORM INVALID %r : %r", request.POST, form.errors) + return HttpResponseBadRequest("State form invalid")