internalize user model + resize fields (username, firstname, lastname) and add externalid
--- a/.settings/org.eclipse.core.resources.prefs Thu Sep 10 12:06:56 2015 +0200
+++ b/.settings/org.eclipse.core.resources.prefs Tue Sep 15 17:28:56 2015 +0200
@@ -20,5 +20,6 @@
encoding//src/ldt/ldt/test/test_runner.py=utf-8
encoding//src/ldt/ldt/text/migrations/0001_initial.py=utf-8
encoding//src/ldt/ldt/user/migrations/0001_initial.py=utf-8
+encoding//src/ldt/ldt/user/migrations/0002_resize_user_fields_add_external_id.py=utf-8
encoding//virtualenv/web/env/guardianenv/Lib/site-packages/guardian/migrations/0001_initial.py=utf-8
encoding/<project>=UTF-8
--- a/src/ldt/ldt/auth/views.py Thu Sep 10 12:06:56 2015 +0200
+++ b/src/ldt/ldt/auth/views.py Tue Sep 15 17:28:56 2015 +0200
@@ -1,11 +1,11 @@
from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.contrib.auth.forms import AuthenticationForm
from django.contrib.auth.views import login as django_login
from ldt.auth import social_list
+from ldt.user.forms import AdminAuthenticationForm
def login(request, template_name='registration/login.html',
redirect_field_name=REDIRECT_FIELD_NAME,
- authentication_form=AuthenticationForm,
+ authentication_form=AdminAuthenticationForm,
current_app=None):
extra_context = {'social_list': social_list}
--- a/src/ldt/ldt/locale/en/LC_MESSAGES/django.po Thu Sep 10 12:06:56 2015 +0200
+++ b/src/ldt/ldt/locale/en/LC_MESSAGES/django.po Tue Sep 15 17:28:56 2015 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-11 12:18+0000\n"
+"POT-Creation-Date: 2015-09-14 15:16+0200\n"
"PO-Revision-Date: 2012-04-29 22:26+0200\n"
"Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
"Language-Team: IRI\n"
@@ -18,12 +18,10 @@
"X-Generator: Virtaal 0.7.0-mac-beta-1\n"
#: forms/fields.py:20
-#, fuzzy
msgid "The duration field can not be empty."
msgstr "The search field can not be empty."
#: forms/fields.py:21
-#, fuzzy
msgid "Enter a valid duration format;"
msgstr "Enter a valid duration format"
@@ -44,7 +42,7 @@
msgid "all"
msgstr "all"
-#: ldt_utils/forms.py:34 ldt_utils/models.py:72
+#: ldt_utils/forms.py:34 ldt_utils/models.py:74
#: ldt_utils/templates/ldt/ldt_utils/content_list.html:70
msgid "title"
msgstr "title"
@@ -69,7 +67,7 @@
msgid "Content Tag"
msgstr "Content category"
-#: ldt_utils/forms.py:53 ldt_utils/models.py:177
+#: ldt_utils/forms.py:53 ldt_utils/models.py:183
msgid "content.content_creation_date"
msgstr "content creation date"
@@ -101,126 +99,122 @@
msgid "content.front_project"
msgstr "front project"
-#: ldt_utils/forms.py:58 ldt_utils/models.py:176
+#: ldt_utils/forms.py:58 ldt_utils/models.py:182
msgid "content.duration"
msgstr "duration (ms)"
-#: ldt_utils/models.py:61
+#: ldt_utils/models.py:63
msgid "media.external_id"
msgstr "external id"
-#: ldt_utils/models.py:62
+#: ldt_utils/models.py:64
msgid "media.external_permalink"
msgstr "media permalink"
-#: ldt_utils/models.py:63
+#: ldt_utils/models.py:65
msgid "media.external_publication_url"
msgstr "media publication url"
-#: ldt_utils/models.py:64
+#: ldt_utils/models.py:66
msgid "media.external_src_url"
msgstr "media external source url"
-#: ldt_utils/models.py:65
+#: ldt_utils/models.py:67
msgid "media.creation_date"
msgstr "media object creation date"
-#: ldt_utils/models.py:66
+#: ldt_utils/models.py:68
msgid "media.media_creation_date"
msgstr "media creation date"
-#: ldt_utils/models.py:67
+#: ldt_utils/models.py:69
msgid "media.update_date"
msgstr "update date"
-#: ldt_utils/models.py:68
+#: ldt_utils/models.py:70
msgid "media.videopath"
msgstr "videopath"
-#: ldt_utils/models.py:69
+#: ldt_utils/models.py:71
msgid "media.duration"
msgstr "duration (ms)"
-#: ldt_utils/models.py:70
+#: ldt_utils/models.py:72
msgid "media.creator"
msgstr "media creator"
-#: ldt_utils/models.py:71
+#: ldt_utils/models.py:73
msgid "description"
msgstr "description"
-#: ldt_utils/models.py:73
+#: ldt_utils/models.py:75
msgid "media.src"
msgstr "media source"
-#: ldt_utils/models.py:74
+#: ldt_utils/models.py:76
msgid "media.src_hash"
msgstr "source hash"
-#: ldt_utils/models.py:75
+#: ldt_utils/models.py:77
msgid "media.mimetype"
msgstr "mimetype"
-#: ldt_utils/models.py:169
+#: ldt_utils/models.py:175
msgid "content.iri_id"
msgstr "iri id"
-#: ldt_utils/models.py:170
+#: ldt_utils/models.py:176
msgid "content.iriurl"
msgstr "iri url"
-#: ldt_utils/models.py:171
+#: ldt_utils/models.py:177
msgid "content.creation_date"
msgstr "content creation date"
-#: ldt_utils/models.py:172
+#: ldt_utils/models.py:178
msgid "content.update_date"
msgstr "content update date"
-#: ldt_utils/models.py:173
+#: ldt_utils/models.py:179
msgid "content.title"
msgstr "title"
-#: ldt_utils/models.py:174
+#: ldt_utils/models.py:180
msgid "content.description"
msgstr "description"
-#: ldt_utils/models.py:175
+#: ldt_utils/models.py:181
msgid "content.authors"
msgstr "authors"
-#: ldt_utils/models.py:550
+#: ldt_utils/models.py:555
msgid "content_stat.content"
msgstr "annotation statistics"
-#: ldt_utils/models.py:551
+#: ldt_utils/models.py:556
msgid "content_stat.annotations_volume"
msgstr "annotation volume"
-#: ldt_utils/models.py:552
+#: ldt_utils/models.py:557
msgid "content_stat.polemics_volume"
msgstr "Annotation volume"
-#: ldt_utils/models.py:553
+#: ldt_utils/models.py:558
msgid "content.nb_annotation"
msgstr "annotation number"
-#: ldt_utils/models.py:554
+#: ldt_utils/models.py:559
msgid "content.last_annotated"
msgstr "last annotated"
-#: ldt_utils/models.py:614
+#: ldt_utils/models.py:625
msgid "created by"
msgstr "created by"
-#: ldt_utils/models.py:615
+#: ldt_utils/models.py:626
msgid "changed by"
msgstr "changed by"
-#: ldt_utils/utils.py:205 ldt_utils/utils.py:388
-msgid "Personal cutting"
-msgstr "Personal cutting"
-
#: ldt_utils/templates/admin/ldt_utils/app_action.html:4
#: templates/admin/cms_change_list.html:7
#: templates/admin/page_app_index.html:8
@@ -361,9 +355,8 @@
msgstr "about"
#: ldt_utils/templates/front/front_group.html:35
-#, fuzzy
msgid "Projects shared by the group"
-msgstr "Projects shared with me only"
+msgstr "Projects shared by the group"
#: ldt_utils/templates/front/front_group.html:36
#: templates/admin/cms_change_list.html:110
@@ -372,21 +365,18 @@
msgstr "Filter"
#: ldt_utils/templates/front/front_group.html:40
-#, fuzzy
msgid "Search in the projects title"
-msgstr "Search in the medias title"
+msgstr "Search in the projects title"
#: ldt_utils/templates/front/front_group.html:76
#: ldt_utils/templates/front/front_group.html:77
-#, fuzzy
msgid "open this project"
-msgstr "Copy your project"
+msgstr "open this project"
#: ldt_utils/templates/front/front_group.html:83
#: ldt_utils/templates/front/front_group.html:118
-#, fuzzy
msgid "See all the group's medias"
-msgstr "See for all medias"
+msgstr "See all the group's medias"
#: ldt_utils/templates/front/front_group.html:87
msgid "Medias annotated by the group"
@@ -394,13 +384,12 @@
#: ldt_utils/templates/front/front_group.html:98
#: ldt_utils/templates/front/front_group.html:120
-#, fuzzy
msgid "See all the group's projects"
msgstr "The group's project"
#: ldt_utils/templates/front/front_group.html:102
msgid "Back to the group list"
-msgstr ""
+msgstr "Back to the group list"
#: ldt_utils/templates/front/front_group.html:110
msgid "About the group"
@@ -420,9 +409,8 @@
#: ldt_utils/templates/front/front_groups.html:26
#: ldt_utils/templates/front/front_groups.html:27
-#, fuzzy
msgid "See this group"
-msgstr "Edit this group"
+msgstr "See this group"
#: ldt_utils/templates/front/front_home.html:8
msgid "front.home"
@@ -462,7 +450,7 @@
#: ldt_utils/templates/front/front_player.html:55
msgid "Afficher/Masquer les annotations"
-msgstr ""
+msgstr "Afficher/Masquer les annotations"
#: ldt_utils/templates/front/front_player.html:66
#: ldt_utils/templates/front/front_player.html:77
@@ -473,10 +461,10 @@
#: ldt_utils/templates/ldt/ldt_utils/groups.html:130
#: ldt_utils/templates/ldt/ldt_utils/groups.html:142
#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:80
+#: ldt_utils/templates/ldt/ldt_utils/partial/permissions.html:133
#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:96
#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:107
#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:122
-#: ldt_utils/templates/ldt/ldt_utils/partial/permissions.html:133
#: templates/ldt/ldt_base.html:128
msgid "search"
msgstr "search"
@@ -501,20 +489,17 @@
msgstr "No results for <b>%(search)s</b>."
#: ldt_utils/templates/front/front_search_results.html:63
-#, fuzzy
msgid "Results in medias for"
-msgstr "Results for"
+msgstr "Results in medias for"
#: ldt_utils/templates/front/front_search_results.html:63
-#, fuzzy
msgid "See all medias"
-msgstr "See for all medias"
+msgstr "See all medias"
#: ldt_utils/templates/front/front_search_results.html:95
#: ldt_utils/templates/front/front_search_results.html:97
-#, fuzzy
msgid "Results in annotations for"
-msgstr "tags"
+msgstr "Results in annotations for"
#: ldt_utils/templates/front/front_search_results.html:102
#: ldt_utils/templates/ldt/ldt_utils/search_results.html:62
@@ -523,7 +508,7 @@
#: ldt_utils/templates/front/front_search_results.html:103
msgid "Segment"
-msgstr ""
+msgstr "Segment"
#: ldt_utils/templates/front/front_search_results.html:122
msgid "annotation distribution"
@@ -610,9 +595,8 @@
"<br />Please resubmit the media form after making the following changes:"
#: ldt_utils/templates/ldt/ldt_utils/create_content.html:107
-#, fuzzy
msgid "Modify this content"
-msgstr "You can not edit this content"
+msgstr "Modify this content"
#: ldt_utils/templates/ldt/ldt_utils/create_content.html:109
#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:104
@@ -732,246 +716,289 @@
msgid "create_project"
msgstr "Create new project"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:25
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:239
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:24
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:140
msgid "Show Player"
msgstr "Show Player"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:26
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:25
msgid "Hide Player"
msgstr "Hide Player"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:61
-#, fuzzy
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:62
msgid "Share the project"
-msgstr "Create new project"
+msgstr "Share the project"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:62
-#, fuzzy
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:63
msgid "List of the project's contents"
-msgstr "clik here to see the project content"
+msgstr "List of the project's contents"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:65
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:66
msgid "Link to the Metadata Player"
-msgstr ""
+msgstr "Link to the Metadata Player"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:65
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:70
-#, fuzzy
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:66
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:71
msgid "See"
-msgstr "Select"
+msgstr "See"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:65
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:69
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:70
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:66
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:70
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:71
msgid "Select"
msgstr "Select"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:69
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:70
msgid "project id"
msgstr "project id"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:70
-#, fuzzy
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:71
msgid "The project in Lignes de Temps"
msgstr "Display the results in Lignes De Temps"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:75
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:76
msgid "popup_player"
msgstr "player"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:76
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:77
msgid "popup_ldt_iframe"
msgstr "Code for Lignes de Temps"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:77
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:78
msgid "popup_seo_body"
msgstr "seo"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:78
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:79
msgid "popup_seo_meta"
msgstr "meta"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:79
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:80
msgid "popup_links"
msgstr "links"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:98
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:106
msgid "Integration mode"
msgstr "Integration mode"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:99
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:107
msgid "div"
msgstr "div"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:100
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:108
msgid "iframe"
msgstr "iframe"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:103
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:112
msgid "Player Size : "
-msgstr ""
+msgstr "Player Size: "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:110
-#, fuzzy
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:119
msgid "Preset Modes"
-msgstr "reset password"
+msgstr "Preset Modes"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:113
-#, fuzzy
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:122
msgid "Basic configuration"
-msgstr "New password confirmation"
+msgstr "Basic configuration"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:114
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:123
msgid "Polemic configuration"
-msgstr ""
+msgstr "Polemic configuration"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:115
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:124
msgid "Polemic configuration with tagcloud, annotationsList and Social widgets"
-msgstr ""
+msgstr "Polemic configuration with tagcloud, annotationsList and Social widgets"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:122
-#, fuzzy
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:131
msgid "Create your own configuration"
-msgstr "Create your project"
+msgstr "Create your own configuration"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:126
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:21
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:143
msgid "The video starts automatically"
-msgstr ""
+msgstr "The video starts automatically"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:130
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:25
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:23
msgid "Displays a form to create a new annotation"
-msgstr ""
+msgstr "Displays a form to create a new annotation"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:133
-#, fuzzy
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:28
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:26
msgid "audio annotation"
-msgstr "annotation uri"
+msgstr "audio annotation"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:134
-#, fuzzy
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:29
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:27
msgid "Audio annotation"
-msgstr "annotation uri"
+msgstr "Audio annotation"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:134
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:29
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:27
msgid "Allows the user to record an annotation"
-msgstr ""
+msgstr "Allows the user to record an annotation"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:136
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:31
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:33
msgid "Use most used tags "
-msgstr ""
+msgstr "Use most used tags "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:138
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:33
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:35
msgid "Set your own tags : "
-msgstr ""
+msgstr "Set your own tags: "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:138
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:33
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:35
msgid "Write your tags separeted by a comma"
-msgstr ""
+msgstr "Write your tags separated by a comma"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:141
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:142
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:36
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:37
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:38
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:39
msgid "4 polemics buttons"
-msgstr ""
+msgstr "4 polemics buttons"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:142
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:37
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:39
msgid "Displays or removes the 4 polemics buttons"
-msgstr ""
+msgstr "Displays or removes the 4 polemics buttons"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:147
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:42
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:45
msgid "Displays segments of a media as rectangles on an horizontal line"
-msgstr ""
+msgstr "Displays segments of a media as rectangles on an horizontal line"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:150
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:46
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:56
msgid ""
"Displays every segment of a media as rectangles on multiple horizontal lines"
msgstr ""
+"Displays every segment of a media as rectangles on multiple horizontal lines"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:153
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:50
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:60
msgid "Show a list of all annotations accross every project for this content"
-msgstr ""
+msgstr "Show a list of all annotations across every project for this content"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:157
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:54
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:64
msgid ""
"Shows the polemical timeline, i.e. tweets colored according to the polemical "
"syntax"
msgstr ""
+"Shows the polemical timeline, i.e. tweets colored according to the polemical "
+"syntax"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:160
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:57
msgid "Display in the polemic timeline : "
-msgstr ""
+msgstr "Display in the polemic timeline: "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:161
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:58
msgid "only tweets"
-msgstr ""
+msgstr "only tweets"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:162
-#, fuzzy
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:59
msgid "all annotations"
-msgstr "tags"
+msgstr "all annotations"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:164
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:61
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:71
msgid "Personalize tweet's color"
-msgstr ""
+msgstr "Personalize tweet's color"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:169
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:66
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:76
msgid "Default color"
-msgstr ""
+msgstr "Default color"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:173
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:70
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:80
msgid "Polemic's color : ++ : "
-msgstr ""
+msgstr "Polemic's color : ++ : "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:183
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:80
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:90
msgid "Found color"
-msgstr ""
+msgstr "Found color"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:191
-msgid "Displays a curve showing the volume of annotations across time"
-msgstr ""
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:88
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:98
+msgid "Displays a curve showing the project annotation volume across time"
+msgstr "Displays a curve showing the project annotation volume across time"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:195
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:92
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:102
msgid "personalize sparkline's color"
-msgstr ""
+msgstr "personalize sparkline's color"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:199
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:96
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:106
msgid "line color"
-msgstr ""
+msgstr "line color"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:204
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:101
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:111
msgid "fill color"
-msgstr ""
+msgstr "fill color"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:211
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:108
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:118
msgid "Displays a div in order to watch the slides displayed in the media"
-msgstr ""
+msgstr "Displays a div in order to watch the slides displayed in the media"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:215
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:112
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:122
msgid " Adds buttons to share an URL on social networks"
-msgstr ""
+msgstr " Adds buttons to share an URL on social networks"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:222
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:119
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:129
msgid "share with email"
-msgstr ""
+msgstr "share with email"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:226
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:123
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:133
msgid ""
" Displays information relative to a single segment/annotation while it is "
"being played"
msgstr ""
+" Displays information relative to a single segment/annotation while it is "
+"being played"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:229
+
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:126
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:136
msgid "Show the contents on a tweet when clicked (in Polemic Widget)"
-msgstr ""
+msgstr "Show the contents on a tweet when clicked (in Polemic Widget)"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:232
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:129
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:139
msgid "Shows a tag cloud"
-msgstr ""
+msgstr "Shows a tag cloud"
+
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:131
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:146
+msgid "Concatenate all projects using this content"
+msgstr "Concatenate all projects using this content"
+
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:20
+msgid "Widgets"
+msgstr "Widgets"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:234
-#, fuzzy
-msgid "Concatenate all projects using this content"
-msgstr "You can not edit this content"
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:30
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:49
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:68
+msgid ""
+"Display annotation types: (annotation types must be separated by commas, "
+"leave blank to display everything) "
+msgstr ""
+"Display annotation types: (annotation types must be separated by commas, "
+"leave blank to display everything) "
+
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:141
+msgid "Other settings"
+msgstr "Other settings"
#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:21
#: ldt_utils/templates/ldt/ldt_utils/error_confirm_popup.html:34
@@ -1025,67 +1052,6 @@
msgid "project list"
msgstr "Projects"
-#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:88
-msgid "Submit"
-msgstr "Submit"
-
-#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:93
-#: templates/ldt/ldt_base.html:117
-msgid "Published projects"
-msgstr "Published projects"
-
-#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:94
-#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:120
-msgid "Create project"
-msgstr "Create new project"
-
-#: ldt_utils/templates/ldt/ldt_utils/reset_confirm.html:22
-msgid "confirm_reset"
-msgstr "Confirm reset"
-
-#: ldt_utils/templates/ldt/ldt_utils/search_form.html:10
-msgid "The search field can not be empty."
-msgstr "The search field can not be empty."
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:62
-msgid "Results for "
-msgstr "Results for"
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:78
-msgid ""
-"Are you sure you want to delete this annotation ? You cannot undo this "
-"action."
-msgstr ""
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:78
-msgid "Delete permantly the current annotation"
-msgstr ""
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:80
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:26
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:28
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:31
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:38
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:40
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:43
-#: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:22
-#: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:24
-msgid "open ldt"
-msgstr "open ldt"
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:91
-msgid "Tags"
-msgstr "Tags"
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:110
-#, python-format
-msgid "Page %(number)s of %(num_pages)s"
-msgstr "Page %(number)s of %(num_pages)s"
-
-#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:103
-msgid "content list"
-msgstr "Contents"
-
#: ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html:8
msgid "All categories"
msgstr "All categories"
@@ -1159,6 +1125,7 @@
#: ldt_utils/templates/ldt/ldt_utils/partial/permissions.html:169
#: ldt_utils/templates/ldt/ldt_utils/partial/sharewith.html:7
+#: user/models.py:129
msgid "user"
msgstr "user"
@@ -1186,6 +1153,18 @@
msgid "Upload a new picture"
msgstr "Upload a new picture"
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:26
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:28
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:31
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:38
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:40
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:43
+#: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:22
+#: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:24
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:80
+msgid "open ldt"
+msgstr "open ldt"
+
#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:48
msgid "copy project"
msgstr "Copy your project"
@@ -1217,62 +1196,117 @@
msgid "Project published"
msgstr " published"
-#: ldt_utils/views/content.py:130
+#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:88
+msgid "Submit"
+msgstr "Submit"
+
+#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:93
+#: templates/ldt/ldt_base.html:117
+msgid "Published projects"
+msgstr "Published projects"
+
+#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:94
+#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:120
+msgid "Create project"
+msgstr "Create new project"
+
+#: ldt_utils/templates/ldt/ldt_utils/reset_confirm.html:22
+msgid "confirm_reset"
+msgstr "Confirm reset"
+
+#: ldt_utils/templates/ldt/ldt_utils/search_form.html:10
+msgid "The search field can not be empty."
+msgstr "The search field can not be empty."
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:62
+msgid "Results for "
+msgstr "Results for"
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:78
+msgid ""
+"Are you sure you want to delete this annotation ? You cannot undo this "
+"action."
+msgstr ""
+"Are you sure you want to delete this annotation ? You cannot undo this "
+"action."
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:78
+msgid "Delete permantly the current annotation"
+msgstr "Delete permantly the current annotation"
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:91
+msgid "Tags"
+msgstr "Tags"
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:110
+#, python-format
+msgid "Page %(number)s of %(num_pages)s"
+msgstr "Page %(number)s of %(num_pages)s"
+
+#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:103
+msgid "content list"
+msgstr "Contents"
+
+#: ldt_utils/utils.py:316 ldt_utils/utils.py:499
+msgid "Personal cutting"
+msgstr "Personal cutting"
+
+#: ldt_utils/views/content.py:131
msgid "Problem when downloading file from url : "
msgstr "Problem when downloading file from url: "
-#: ldt_utils/views/content.py:133
+#: ldt_utils/views/content.py:134
msgid "Problem when uploading file : "
msgstr "Problem when uploading file: "
-#: ldt_utils/views/content.py:358
+#: ldt_utils/views/content.py:338
#, python-format
msgid "There is %(count)d error when deleting content"
msgid_plural "There are %(count)d errors when deleting content"
msgstr[0] "There is %(count)d error when deleting content"
msgstr[1] "There are %(count)d errors when deleting content"
-#: ldt_utils/views/content.py:359
+#: ldt_utils/views/content.py:339
msgid "title error deleting content"
msgstr "Error when deleting content"
-#: ldt_utils/views/content.py:364
+#: ldt_utils/views/content.py:344
#, python-format
msgid "Confirm delete content %(titles)s"
msgstr "Confirm delete content %(titles)s"
-#: ldt_utils/views/content.py:365
+#: ldt_utils/views/content.py:345
msgid "confirm delete content"
msgstr "Confirm delete content"
-#: ldt_utils/views/content.py:376
+#: ldt_utils/views/content.py:356
#, python-format
msgid "Please unpublish the front project %(title)s"
msgstr "please unpublish the front project %(title)s"
-#: ldt_utils/views/content.py:377
+#: ldt_utils/views/content.py:357
msgid "The front project is published"
msgstr "The front project is published"
-#: ldt_utils/views/content.py:378 ldt_utils/views/content.py:381
-#: ldt_utils/views/project.py:139
+#: ldt_utils/views/content.py:358 ldt_utils/views/content.py:361
+#: ldt_utils/views/project.py:141
msgid "confirm reset"
msgstr "Confirm reset"
-#: ldt_utils/views/content.py:380 ldt_utils/views/project.py:138
+#: ldt_utils/views/content.py:360 ldt_utils/views/project.py:140
#, python-format
msgid "please confirm reseting project %(title)s"
msgstr "please confirm reseting project %(title)s"
-#: ldt_utils/views/content.py:407
+#: ldt_utils/views/content.py:387
msgid "An error occurred - Please try again or contact webmaster"
msgstr "An error occurred - Please try again or contact webmaster"
-#: ldt_utils/views/content.py:408
+#: ldt_utils/views/content.py:388
msgid "Error"
msgstr "Error"
-#: ldt_utils/views/content.py:453
+#: ldt_utils/views/content.py:433
#, python-format
msgid ""
"Content '%(title)s' is referenced by this project : %(project_titles)s. "
@@ -1287,7 +1321,7 @@
"Content '%(title)s' is referenced by %(count)d projects: %(project_titles)s. "
"Please delete them beforehand."
-#: ldt_utils/views/content.py:456
+#: ldt_utils/views/content.py:436
#, python-format
msgid ""
"The project '%(project_title)s' pointing on the content '%(title)s' has "
@@ -1298,24 +1332,34 @@
"several annotations. Do you want to delete the content and the project "
"anyway ?"
-#: ldt_utils/views/json.py:43 ldt_utils/views/rdf.py:15
+#: ldt_utils/views/embed/meta.py:64 ldt_utils/views/embed/v2/views.py:31
+msgid ""
+"The content does not exists or you are not allowed to access this content"
+msgstr ""
+"The content does not exists or you are not allowed to access this content"
+
+#: ldt_utils/views/embed/meta.py:68 ldt_utils/views/embed/v2/views.py:35
+msgid "Parameters project_id or content_id must be given in the url"
+msgstr "Parameters project_id or content_id must be given in the url"
+
+#: ldt_utils/views/ldt_json.py:46 ldt_utils/views/rdf.py:15
msgid "You can not access this project"
msgstr "You can not access this project"
-#: ldt_utils/views/project.py:119
+#: ldt_utils/views/project.py:121
#, python-format
msgid "the project %(title)s is published. please unpublish before deleting."
msgstr "the project %(title)s is published. please unpublish before deleting."
-#: ldt_utils/views/project.py:120 ldt_utils/views/project.py:124
+#: ldt_utils/views/project.py:122 ldt_utils/views/project.py:126
msgid "can not delete the project. Please correct the following error"
msgstr "can not delete the project. Please correct the following error"
-#: ldt_utils/views/project.py:121 ldt_utils/views/project.py:125
+#: ldt_utils/views/project.py:123 ldt_utils/views/project.py:127
msgid "title error deleting project"
msgstr "Error when deleting project"
-#: ldt_utils/views/project.py:123
+#: ldt_utils/views/project.py:125
#, python-format
msgid ""
"the project %(title)s is the front project of %(content)s. please delete "
@@ -1324,57 +1368,42 @@
"the project %(title)s is the front project of %(content)s. please delete "
"this content first."
-#: ldt_utils/views/project.py:127
+#: ldt_utils/views/project.py:129
#, python-format
msgid "please confirm deleting project %(title)s"
msgstr "please confirm deleting project %(title)s"
-#: ldt_utils/views/project.py:128
+#: ldt_utils/views/project.py:130
msgid "confirm deletion"
msgstr "Confirm deletion"
-#: ldt_utils/views/workspace.py:118
-msgid ""
-"The content does not exists or you are not allowed to access this content"
-msgstr ""
-"The content does not exists or you are not allowed to access this content"
-
-#: ldt_utils/views/workspace.py:122
-msgid "Parameters project_id or content_id must be given in the url"
-msgstr "Parameters project_id or content_id must be given in the url"
+#: ldt_utils/views/workspace.py:237
+msgid "Annotation not found in the xml"
+msgstr "Annotation not found in the xml"
-#: ldt_utils/views/workspace.py:438
-#, fuzzy
-msgid "Annotation not found in the xml"
-msgstr "All annotations on the media"
+#: ldt_utils/views/workspace.py:248
+msgid "Annotation not found"
+msgstr "Annotation not found"
-#: ldt_utils/views/workspace.py:449
-#, fuzzy
-msgid "Annotation not found"
-msgstr "All annotations on the media"
-
-#: ldt_utils/views/workspace.py:451 ldt_utils/views/workspace.py:453
+#: ldt_utils/views/workspace.py:250 ldt_utils/views/workspace.py:252
msgid "Project not found"
-msgstr ""
+msgstr "Project not found"
#: templates/403.html:6
-#, fuzzy
msgid "403 error"
-msgstr "Error"
+msgstr "403 Error"
#: templates/403.html:9
-#, fuzzy
msgid "You don't have the right permission to access this page"
-msgstr "You don't have permission to edit anything."
+msgstr "You don't have the right permission to access this page"
#: templates/404.html:7
-#, fuzzy
msgid "404 error"
-msgstr "Error"
+msgstr "404 Error"
#: templates/404.html:10
msgid "Sorry, we couldn't find your page"
-msgstr ""
+msgstr "Sorry, we couldn't find your page"
#: templates/admin/cms_change_form.html:30
msgid "Approve page deletion"
@@ -1655,40 +1684,98 @@
msgid "annotation.update_date"
msgstr "update date"
-#: user/admin.py:20
-#, fuzzy
+#: user/admin.py:28
msgid "profile"
-msgstr "Profiles"
+msgstr "profiles"
-#: user/forms.py:38 user/forms.py:63
+#: user/forms.py:52 user/forms.py:93 user/forms.py:109
+#, python-format
+msgid ""
+"Required, %(username_length)s characters or fewer. Only letters, numbers, "
+"and @, ., +, -, or _ characters."
+msgstr ""
+"Required, %(username_length)s characters or fewer. Only letters, numbers, "
+"and @, ., +, -, or _ characters."
+
+
+#: user/forms.py:69 user/forms.py:115
#: user/templates/ldt/user/change_profile.html:83
msgid "Language"
msgstr "Language"
-#: user/forms.py:39 user/forms.py:75
+#: user/forms.py:70 user/forms.py:127
msgid "Profile picture"
msgstr "Profile picture"
-#: user/forms.py:48 user/forms.py:86
+#: user/forms.py:79 user/forms.py:138
#, python-format
msgid "Image size is limited to %s"
msgstr "Image size is limited to %s"
-#: user/views.py:25
-msgid "Your profile has been updated."
-msgstr "Your profile has been updated."
+#: user/models.py:86
+msgid "username"
+msgstr "username"
+
+#: user/models.py:89
+#, python-format
+msgid "Required. %d characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "Required. %d characters or fewer. Letters, digits and @/./+/-/_ only."
-#: user/views.py:48
-msgid "Your password has been updated."
-msgstr "Your password has been updated."
+#: user/models.py:93
+msgid ""
+"Enter a valid username. This value may contain only letters, numbers and @/./"
+"+/-/_ characters."
+msgstr ""
+"Enter a valid username. This value may contain only letters, numbers and @/./"
+"+/-/_ characters."
+
+#: user/models.py:98
+msgid "A user with that username already exists."
+msgstr "A user with that username already exists."
+
+#: user/models.py:101
+msgid "first name"
+msgstr "first name"
+
+#: user/models.py:102
+msgid "last name"
+msgstr "last name"
-#: user/views.py:72
-msgid "Your profile picture has been updated."
-msgstr "Your profile picture has been updated."
+#: user/models.py:103
+msgid "external id"
+msgstr "external id"
+
+#: user/models.py:104
+msgid "email address"
+msgstr "email address"
+
+#: user/models.py:106
+msgid "staff status"
+msgstr "staff states"
+
+#: user/models.py:108
+msgid "Designates whether the user can log into this admin site."
+msgstr "Designates whether the user can log into this admin site."
-#: user/views.py:93 user/templates/registration/login.html:25
-msgid "Sorry, that's not a valid username or password."
-msgstr "Sorry, that's not a valid username or password."
+#: user/models.py:111
+msgid "active"
+msgstr "active"
+
+#: user/models.py:114
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+
+#: user/models.py:118
+msgid "date joined"
+msgstr "date joined"
+
+#: user/models.py:130
+msgid "users"
+msgstr "users"
#: user/templates/ldt/user/change_password.html:31
msgid "Old password"
@@ -1801,6 +1888,10 @@
msgid "Log in again"
msgstr "Log in"
+#: user/templates/registration/login.html:25 user/views.py:96
+msgid "Sorry, that's not a valid username or password."
+msgstr "Sorry, that's not a valid username or password."
+
#: user/templates/registration/login.html:47
msgid "login"
msgstr "login"
@@ -1969,6 +2060,18 @@
"We've e-mailed you instructions for activate your account to the e-mail "
"address you submitted. You should be receiving it shortly."
+#: user/views.py:28
+msgid "Your profile has been updated."
+msgstr "Your profile has been updated."
+
+#: user/views.py:51
+msgid "Your password has been updated."
+msgstr "Your password has been updated."
+
+#: user/views.py:75
+msgid "Your profile picture has been updated."
+msgstr "Your profile picture has been updated."
+
#~ msgid "Search in the medias title"
#~ msgstr "Search in the medias title"
@@ -1993,9 +2096,6 @@
#~ msgid "The two emails didn't match."
#~ msgstr "The two emails didn't match."
-#~ msgid "Last name"
-#~ msgstr "Last name"
-
#~ msgid "Content creation failure"
#~ msgstr "Failed content creation"
--- a/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Thu Sep 10 12:06:56 2015 +0200
+++ b/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Tue Sep 15 17:28:56 2015 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-11 12:18+0000\n"
+"POT-Creation-Date: 2015-09-14 15:16+0200\n"
"PO-Revision-Date: 2010-03-09 15:52+0100\n"
"Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,7 +41,7 @@
msgid "all"
msgstr "tous"
-#: ldt_utils/forms.py:34 ldt_utils/models.py:72
+#: ldt_utils/forms.py:34 ldt_utils/models.py:74
#: ldt_utils/templates/ldt/ldt_utils/content_list.html:70
msgid "title"
msgstr "titre"
@@ -66,7 +66,7 @@
msgid "Content Tag"
msgstr "Catégorie de contenu"
-#: ldt_utils/forms.py:53 ldt_utils/models.py:177
+#: ldt_utils/forms.py:53 ldt_utils/models.py:183
msgid "content.content_creation_date"
msgstr "Date de création du contenu"
@@ -98,126 +98,122 @@
msgid "content.front_project"
msgstr "Choisir le front project"
-#: ldt_utils/forms.py:58 ldt_utils/models.py:176
+#: ldt_utils/forms.py:58 ldt_utils/models.py:182
msgid "content.duration"
msgstr "Durée"
-#: ldt_utils/models.py:61
+#: ldt_utils/models.py:63
msgid "media.external_id"
msgstr "id externe"
-#: ldt_utils/models.py:62
+#: ldt_utils/models.py:64
msgid "media.external_permalink"
msgstr "permalien externe"
-#: ldt_utils/models.py:63
+#: ldt_utils/models.py:65
msgid "media.external_publication_url"
msgstr "url de publication externe"
-#: ldt_utils/models.py:64
+#: ldt_utils/models.py:66
msgid "media.external_src_url"
msgstr "url source"
-#: ldt_utils/models.py:65
+#: ldt_utils/models.py:67
msgid "media.creation_date"
msgstr "Date de création"
-#: ldt_utils/models.py:66
+#: ldt_utils/models.py:68
msgid "media.media_creation_date"
msgstr "Date de création du média"
-#: ldt_utils/models.py:67
+#: ldt_utils/models.py:69
msgid "media.update_date"
msgstr "Date de maj"
-#: ldt_utils/models.py:68
+#: ldt_utils/models.py:70
msgid "media.videopath"
msgstr "videopath"
-#: ldt_utils/models.py:69
+#: ldt_utils/models.py:71
msgid "media.duration"
msgstr "Durée du contenu (ms)"
-#: ldt_utils/models.py:70
+#: ldt_utils/models.py:72
msgid "media.creator"
msgstr "Créateur"
-#: ldt_utils/models.py:71
+#: ldt_utils/models.py:73
msgid "description"
msgstr "description"
-#: ldt_utils/models.py:73
+#: ldt_utils/models.py:75
msgid "media.src"
msgstr "Sources"
-#: ldt_utils/models.py:74
+#: ldt_utils/models.py:76
msgid "media.src_hash"
msgstr "Hash de la source"
-#: ldt_utils/models.py:75
+#: ldt_utils/models.py:77
msgid "media.mimetype"
msgstr "mimetype"
-#: ldt_utils/models.py:169
+#: ldt_utils/models.py:175
msgid "content.iri_id"
msgstr "iri id"
-#: ldt_utils/models.py:170
+#: ldt_utils/models.py:176
msgid "content.iriurl"
msgstr "iri url"
-#: ldt_utils/models.py:171
+#: ldt_utils/models.py:177
msgid "content.creation_date"
msgstr "date de création"
-#: ldt_utils/models.py:172
+#: ldt_utils/models.py:178
msgid "content.update_date"
msgstr "Date de maj"
-#: ldt_utils/models.py:173
+#: ldt_utils/models.py:179
msgid "content.title"
msgstr "titre"
-#: ldt_utils/models.py:174
+#: ldt_utils/models.py:180
msgid "content.description"
msgstr "Description"
-#: ldt_utils/models.py:175
+#: ldt_utils/models.py:181
msgid "content.authors"
msgstr "Auteurs"
-#: ldt_utils/models.py:550
+#: ldt_utils/models.py:555
msgid "content_stat.content"
msgstr "statistiques d'annotation"
-#: ldt_utils/models.py:551
+#: ldt_utils/models.py:556
msgid "content_stat.annotations_volume"
msgstr "Volume d'annotations"
-#: ldt_utils/models.py:552
+#: ldt_utils/models.py:557
msgid "content_stat.polemics_volume"
msgstr "Volume d'annotations"
-#: ldt_utils/models.py:553
+#: ldt_utils/models.py:558
msgid "content.nb_annotation"
msgstr "nombre d'annotations"
-#: ldt_utils/models.py:554
+#: ldt_utils/models.py:559
msgid "content.last_annotated"
msgstr "annoté pour la dernière foiss"
-#: ldt_utils/models.py:614
+#: ldt_utils/models.py:625
msgid "created by"
msgstr "créé par"
-#: ldt_utils/models.py:615
+#: ldt_utils/models.py:626
msgid "changed by"
msgstr "modifié par"
-#: ldt_utils/utils.py:205 ldt_utils/utils.py:388
-msgid "Personal cutting"
-msgstr "Découpages personnels"
-
#: ldt_utils/templates/admin/ldt_utils/app_action.html:4
#: templates/admin/cms_change_list.html:7
#: templates/admin/page_app_index.html:8
@@ -453,7 +449,7 @@
#: ldt_utils/templates/front/front_player.html:55
msgid "Afficher/Masquer les annotations"
-msgstr ""
+msgstr "Afficher/Masquer les annotations"
#: ldt_utils/templates/front/front_player.html:66
#: ldt_utils/templates/front/front_player.html:77
@@ -464,10 +460,10 @@
#: ldt_utils/templates/ldt/ldt_utils/groups.html:130
#: ldt_utils/templates/ldt/ldt_utils/groups.html:142
#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:80
+#: ldt_utils/templates/ldt/ldt_utils/partial/permissions.html:133
#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:96
#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:107
#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:122
-#: ldt_utils/templates/ldt/ldt_utils/partial/permissions.html:133
#: templates/ldt/ldt_base.html:128
msgid "search"
msgstr "Recherche"
@@ -719,161 +715,177 @@
msgid "create_project"
msgstr "Créer un nouveau projet Ligne de Temps"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:25
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:239
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:24
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:140
msgid "Show Player"
msgstr "Afficher le Lecteur métadata"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:26
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:25
msgid "Hide Player"
msgstr "Masquer le Lecteur métadata "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:61
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:62
msgid "Share the project"
msgstr "Partager le projet"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:62
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:63
msgid "List of the project's contents"
msgstr "Liste des contenus du projet"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:65
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:66
msgid "Link to the Metadata Player"
msgstr "Lien vers le Metadata Player"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:65
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:70
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:66
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:71
msgid "See"
msgstr "Voir"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:65
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:69
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:70
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:66
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:70
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:71
msgid "Select"
msgstr "Sélectionner"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:69
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:70
msgid "project id"
msgstr "Identifiant du projet "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:70
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:71
msgid "The project in Lignes de Temps"
msgstr "Le projet dans Lignes De Temps"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:75
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:76
msgid "popup_player"
msgstr "Code Lecteur métadata"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:76
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:77
msgid "popup_ldt_iframe"
msgstr "Code Lignes De Temps"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:77
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:78
msgid "popup_seo_body"
msgstr "Code SEO"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:78
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:79
msgid "popup_seo_meta"
msgstr "Code balise meta en-tête"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:79
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:80
msgid "popup_links"
msgstr "Liste de liens"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:98
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:106
msgid "Integration mode"
msgstr "Utiliser le mode d'intégration "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:99
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:107
msgid "div"
msgstr "div"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:100
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:108
msgid "iframe"
msgstr "iframe"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:103
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:112
msgid "Player Size : "
msgstr "Taille de la vidéo : "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:110
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:119
msgid "Preset Modes"
msgstr "Modes prédéfinis"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:113
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:122
msgid "Basic configuration"
msgstr "Configuration de base"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:114
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:123
msgid "Polemic configuration"
msgstr "Configuration avec widget polemic"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:115
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:124
msgid "Polemic configuration with tagcloud, annotationsList and Social widgets"
msgstr "Configuration avec widget social, liste d'annotations et tagcloud"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:122
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:131
msgid "Create your own configuration"
msgstr "Personnaliser votre configuration"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:126
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:21
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:143
msgid "The video starts automatically"
msgstr "La vidéo commence automatiquement"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:130
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:25
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:23
msgid "Displays a form to create a new annotation"
msgstr "Permet de créer une annotation en affichant un formulaire"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:133
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:28
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:26
msgid "audio annotation"
msgstr "Annotation audio"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:134
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:29
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:27
msgid "Audio annotation"
msgstr "Annotation audio"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:134
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:29
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:27
msgid "Allows the user to record an annotation"
msgstr ""
"Permet à l'utilisateur d'enregistrer une annotation à l'aide d'un micro"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:136
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:31
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:33
msgid "Use most used tags "
msgstr "Utiliser les tags les plus utilisés"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:138
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:33
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:35
msgid "Set your own tags : "
msgstr "Ajouter vos propres tags"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:138
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:33
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:35
msgid "Write your tags separeted by a comma"
msgstr "Ecrire la liste des tags séparés par une virgule"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:141
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:142
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:36
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:37
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:38
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:39
msgid "4 polemics buttons"
-msgstr ""
+msgstr "4 boutons polémiques"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:142
-#, fuzzy
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:37
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:39
msgid "Displays or removes the 4 polemics buttons"
-msgstr "Afficher dans la timeline polemic : "
+msgstr "Affiche ou enlève les 4 boutons polémiques"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:147
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:42
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:45
msgid "Displays segments of a media as rectangles on an horizontal line"
msgstr "Affiche le chapitrage du média, en horizontal"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:150
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:46
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:56
msgid ""
"Displays every segment of a media as rectangles on multiple horizontal lines"
msgstr ""
"Affiche toutes les lignes de temps du projet avec leur segmentation, en "
"horifzontal"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:153
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:50
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:60
msgid "Show a list of all annotations accross every project for this content"
-msgstr "Affiche la liste de toutes les annotations (tous projets confondus) sur ce contenu"
+msgstr ""
+"Affiche la liste de toutes les annotations (tous projets confondus) sur ce "
+"contenu"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:157
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:54
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:64
msgid ""
"Shows the polemical timeline, i.e. tweets colored according to the polemical "
"syntax"
@@ -881,65 +893,77 @@
"Affiche la timeline polémique, c’est à dire les tweets colorés en fonction "
"de la syntaxe polémique "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:160
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:57
msgid "Display in the polemic timeline : "
msgstr "Afficher dans la timeline polemic : "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:161
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:58
msgid "only tweets"
msgstr "seulement les annotations de type tweet"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:162
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:59
msgid "all annotations"
msgstr "toutes les annotations"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:164
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:61
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:71
msgid "Personalize tweet's color"
msgstr "Personnaliser les couleurs des tweets"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:169
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:66
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:76
msgid "Default color"
msgstr "Couleur des tweets sans annotation polémique : "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:173
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:70
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:80
msgid "Polemic's color : ++ : "
msgstr "Couleur des tweets polémiques de type : ++ : "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:183
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:80
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:90
msgid "Found color"
msgstr "Couleur d'affichage des tweets lors d'une recherche : "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:191
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:88
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:98
msgid "Displays a curve showing the project annotation volume across time"
msgstr ""
-"Affiche une courbe indiquant l’évolution du volume d’annotations du projet au cours du "
-"temps"
+"Affiche une courbe indiquant l’évolution du volume d’annotations du projet "
+"au cours du temps"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:195
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:92
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:102
msgid "personalize sparkline's color"
msgstr "Personnaliser les couleurs de la courbe"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:199
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:96
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:106
msgid "line color"
msgstr "Couleur de la courbe : "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:204
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:101
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:111
msgid "fill color"
msgstr "Couleur sous la courbe : "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:211
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:108
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:118
msgid "Displays a div in order to watch the slides displayed in the media"
msgstr "Permet d'afficher les slides d'un média"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:215
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:112
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:122
msgid " Adds buttons to share an URL on social networks"
msgstr "Affiche des boutons pour partager une URL sur les réseaux sociaux"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:222
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:119
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:129
msgid "share with email"
msgstr "Partager par email"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:226
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:123
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:133
msgid ""
" Displays information relative to a single segment/annotation while it is "
"being played"
@@ -947,18 +971,39 @@
"Affiche les informations relatives à une annotation au moment où celle-ci "
"est jouée"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:229
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:126
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:136
msgid "Show the contents on a tweet when clicked (in Polemic Widget)"
msgstr "Affiche furtivement le contenu d’un tweet "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:232
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:129
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:139
msgid "Shows a tag cloud"
msgstr "Affiche un nuage de mots-clés "
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:234
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:131
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:146
msgid "Concatenate all projects using this content"
msgstr "Agréger tous les projets utilisant ce contenu"
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:20
+msgid "Widgets"
+msgstr "Widgets"
+
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:30
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:49
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:68
+msgid ""
+"Display annotation types: (annotation types must be separated by commas, "
+"leave blank to display everything) "
+msgstr ""
+"Affiche les type d'annotations: (les types d'annotation doivent être séparés"
+" par des virgules. À laisser vide pour tout montrer)"
+
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:141
+msgid "Other settings"
+msgstr "Autres configurations"
+
#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:21
#: ldt_utils/templates/ldt/ldt_utils/error_confirm_popup.html:34
#: ldt_utils/templates/ldt/ldt_utils/reset_confirm.html:22
@@ -1011,69 +1056,6 @@
msgid "project list"
msgstr "Liste des projets"
-#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:88
-msgid "Submit"
-msgstr "Chercher"
-
-#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:93
-#: templates/ldt/ldt_base.html:117
-msgid "Published projects"
-msgstr "Projets publiés"
-
-#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:94
-#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:120
-msgid "Create project"
-msgstr "Créer un nouveau projet d'indexation"
-
-#: ldt_utils/templates/ldt/ldt_utils/reset_confirm.html:22
-msgid "confirm_reset"
-msgstr "Confirmation de réinitialisation"
-
-#: ldt_utils/templates/ldt/ldt_utils/search_form.html:10
-msgid "The search field can not be empty."
-msgstr "Le champ de recherche ne peut pas être vide."
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:62
-msgid "Results for "
-msgstr "Résultats pour "
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:78
-msgid ""
-"Are you sure you want to delete this annotation ? You cannot undo this "
-"action."
-msgstr ""
-"Êtes-vous sûr de vouloir supprimer cette annotation ? Cette action est "
-"irrémédiable."
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:78
-msgid "Delete permantly the current annotation"
-msgstr "Supprimer définitivement cette annotation"
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:80
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:26
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:28
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:31
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:38
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:40
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:43
-#: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:22
-#: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:24
-msgid "open ldt"
-msgstr "Ouvrir sous Lignes de Temps"
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:91
-msgid "Tags"
-msgstr "Tags"
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:110
-#, python-format
-msgid "Page %(number)s of %(num_pages)s"
-msgstr "Page %(number)s de %(num_pages)s"
-
-#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:103
-msgid "content list"
-msgstr "Liste des contenus"
-
#: ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html:8
msgid "All categories"
msgstr "Toutes les catégories"
@@ -1147,6 +1129,7 @@
#: ldt_utils/templates/ldt/ldt_utils/partial/permissions.html:169
#: ldt_utils/templates/ldt/ldt_utils/partial/sharewith.html:7
+#: user/models.py:129
msgid "user"
msgstr "utilisateur"
@@ -1174,6 +1157,18 @@
msgid "Upload a new picture"
msgstr "Téléverser une nouvelle image"
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:26
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:28
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:31
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:38
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:40
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:43
+#: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:22
+#: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:24
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:80
+msgid "open ldt"
+msgstr "Ouvrir sous Lignes de Temps"
+
#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:48
msgid "copy project"
msgstr "Copier votre projet"
@@ -1205,63 +1200,118 @@
msgid "Project published"
msgstr "Projet publié"
-#: ldt_utils/views/content.py:130
+#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:88
+msgid "Submit"
+msgstr "Chercher"
+
+#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:93
+#: templates/ldt/ldt_base.html:117
+msgid "Published projects"
+msgstr "Projets publiés"
+
+#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:94
+#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:120
+msgid "Create project"
+msgstr "Créer un nouveau projet d'indexation"
+
+#: ldt_utils/templates/ldt/ldt_utils/reset_confirm.html:22
+msgid "confirm_reset"
+msgstr "Confirmation de réinitialisation"
+
+#: ldt_utils/templates/ldt/ldt_utils/search_form.html:10
+msgid "The search field can not be empty."
+msgstr "Le champ de recherche ne peut pas être vide."
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:62
+msgid "Results for "
+msgstr "Résultats pour "
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:78
+msgid ""
+"Are you sure you want to delete this annotation ? You cannot undo this "
+"action."
+msgstr ""
+"Êtes-vous sûr de vouloir supprimer cette annotation ? Cette action est "
+"irrémédiable."
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:78
+msgid "Delete permantly the current annotation"
+msgstr "Supprimer définitivement cette annotation"
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:91
+msgid "Tags"
+msgstr "Tags"
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:110
+#, python-format
+msgid "Page %(number)s of %(num_pages)s"
+msgstr "Page %(number)s de %(num_pages)s"
+
+#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:103
+msgid "content list"
+msgstr "Liste des contenus"
+
+#: ldt_utils/utils.py:316 ldt_utils/utils.py:499
+msgid "Personal cutting"
+msgstr "Découpages personnels"
+
+#: ldt_utils/views/content.py:131
msgid "Problem when downloading file from url : "
msgstr "Problème lors du téléchargement du fichier : "
-#: ldt_utils/views/content.py:133
+#: ldt_utils/views/content.py:134
msgid "Problem when uploading file : "
msgstr "Problème lors de l'upload du fichier : "
-#: ldt_utils/views/content.py:358
+#: ldt_utils/views/content.py:338
#, python-format
msgid "There is %(count)d error when deleting content"
msgid_plural "There are %(count)d errors when deleting content"
msgstr[0] "Il y a %(count)d erreur lors de l'effacement du contenu"
msgstr[1] "Il y a %(count)d erreurs lors de l'effacement du contenu"
-#: ldt_utils/views/content.py:359
+#: ldt_utils/views/content.py:339
msgid "title error deleting content"
msgstr "Erreur lors de l'effacement du contenu"
-#: ldt_utils/views/content.py:364
+#: ldt_utils/views/content.py:344
#, python-format
msgid "Confirm delete content %(titles)s"
msgstr "Veuillez confirmer l'effacement du contenu %(titles)s"
-#: ldt_utils/views/content.py:365
+#: ldt_utils/views/content.py:345
msgid "confirm delete content"
msgstr "Confirmation effacement contenu"
-#: ldt_utils/views/content.py:376
+#: ldt_utils/views/content.py:356
#, python-format
msgid "Please unpublish the front project %(title)s"
msgstr "Veuillez dépublier le projet : %(title)s"
-#: ldt_utils/views/content.py:377
+#: ldt_utils/views/content.py:357
msgid "The front project is published"
msgstr "Projet publié"
-#: ldt_utils/views/content.py:378 ldt_utils/views/content.py:381
-#: ldt_utils/views/project.py:139
+#: ldt_utils/views/content.py:358 ldt_utils/views/content.py:361
+#: ldt_utils/views/project.py:141
msgid "confirm reset"
msgstr "Confirmer la réinitialisation"
-#: ldt_utils/views/content.py:380 ldt_utils/views/project.py:138
+#: ldt_utils/views/content.py:360 ldt_utils/views/project.py:140
#, python-format
msgid "please confirm reseting project %(title)s"
msgstr "Veuillez confirmer la réinitialisation du projet %(title)s"
-#: ldt_utils/views/content.py:407
+#: ldt_utils/views/content.py:387
msgid "An error occurred - Please try again or contact webmaster"
msgstr ""
"Une erreur est apparue - Merci de réessayer ou de contacter le webmaster"
-#: ldt_utils/views/content.py:408
+#: ldt_utils/views/content.py:388
msgid "Error"
msgstr "Erreur"
-#: ldt_utils/views/content.py:453
+#: ldt_utils/views/content.py:433
#, python-format
msgid ""
"Content '%(title)s' is referenced by this project : %(project_titles)s. "
@@ -1272,7 +1322,7 @@
msgstr[0] ""
msgstr[1] ""
-#: ldt_utils/views/content.py:456
+#: ldt_utils/views/content.py:436
#, python-format
msgid ""
"The project '%(project_title)s' pointing on the content '%(title)s' has "
@@ -1283,27 +1333,37 @@
"plusieurs annotations. Voulez-vous toujours supprimer le contenu et le "
"projet ?"
-#: ldt_utils/views/json.py:43 ldt_utils/views/rdf.py:15
+#: ldt_utils/views/embed/meta.py:64 ldt_utils/views/embed/v2/views.py:31
+msgid ""
+"The content does not exists or you are not allowed to access this content"
+msgstr "Le contenu n'existe pas ou bien vous n'êtes pas autorisé à y accéder"
+
+#: ldt_utils/views/embed/meta.py:68 ldt_utils/views/embed/v2/views.py:35
+msgid "Parameters project_id or content_id must be given in the url"
+msgstr ""
+"Les paramètres project_id ou content_id doivent être indiqués dans l'url"
+
+#: ldt_utils/views/ldt_json.py:46 ldt_utils/views/rdf.py:15
msgid "You can not access this project"
msgstr "vous n'avez pas l'autorisation de modifier ce projet"
-#: ldt_utils/views/project.py:119
+#: ldt_utils/views/project.py:121
#, python-format
msgid "the project %(title)s is published. please unpublish before deleting."
msgstr ""
"Le projet %(title)s est publié. Veuillez le dépublier pour pouvoir le "
"supprimer"
-#: ldt_utils/views/project.py:120 ldt_utils/views/project.py:124
+#: ldt_utils/views/project.py:122 ldt_utils/views/project.py:126
msgid "can not delete the project. Please correct the following error"
msgstr ""
"Le projet ne peut être effacé. Veuillez corriger les erreurs suivantes."
-#: ldt_utils/views/project.py:121 ldt_utils/views/project.py:125
+#: ldt_utils/views/project.py:123 ldt_utils/views/project.py:127
msgid "title error deleting project"
msgstr "Erreur lors de l'effacement du contenu"
-#: ldt_utils/views/project.py:123
+#: ldt_utils/views/project.py:125
#, python-format
msgid ""
"the project %(title)s is the front project of %(content)s. please delete "
@@ -1312,34 +1372,24 @@
"Le projet %(title)s est le 'front projet' de %(content)s. Veuillez d'abord "
"supprimer ce contenu."
-#: ldt_utils/views/project.py:127
+#: ldt_utils/views/project.py:129
#, python-format
msgid "please confirm deleting project %(title)s"
msgstr "Veuillez confirmer la réinitialisation du projet %(title)s"
-#: ldt_utils/views/project.py:128
+#: ldt_utils/views/project.py:130
msgid "confirm deletion"
msgstr "Confirmation effacement contenu"
-#: ldt_utils/views/workspace.py:118
-msgid ""
-"The content does not exists or you are not allowed to access this content"
-msgstr "Le contenu n'existe pas ou bien vous n'êtes pas autorisé à y accéder"
-
-#: ldt_utils/views/workspace.py:122
-msgid "Parameters project_id or content_id must be given in the url"
-msgstr ""
-"Les paramètres project_id ou content_id doivent être indiqués dans l'url"
-
-#: ldt_utils/views/workspace.py:438
+#: ldt_utils/views/workspace.py:237
msgid "Annotation not found in the xml"
msgstr "Annotation non trouvée dans le xml"
-#: ldt_utils/views/workspace.py:449
+#: ldt_utils/views/workspace.py:248
msgid "Annotation not found"
msgstr "Annotation non trouvée"
-#: ldt_utils/views/workspace.py:451 ldt_utils/views/workspace.py:453
+#: ldt_utils/views/workspace.py:250 ldt_utils/views/workspace.py:252
msgid "Project not found"
msgstr "Projet non trouvé"
@@ -1481,9 +1531,9 @@
#: templates/admin/index.html:19 templates/admin/page_app_index.html:10
#: templates/admin/page_index.html:19
-#, fuzzy, python-format
+#, python-format
msgid "%(name)s"
-msgstr "Nom"
+msgstr "%(name)s"
#: templates/admin/index.html:29 templates/admin/page_change_form.html:20
#: templates/admin/page_index.html:29
@@ -1638,39 +1688,98 @@
msgid "annotation.update_date"
msgstr "Date de maj"
-#: user/admin.py:20
+#: user/admin.py:28
msgid "profile"
msgstr "Profils"
-#: user/forms.py:38 user/forms.py:63
+#: user/forms.py:52 user/forms.py:93 user/forms.py:109
+#, python-format
+msgid ""
+"Required, %(username_length)s characters or fewer. Only letters, numbers, "
+"and @, ., +, -, or _ characters."
+msgstr ""
+"Requis, %(username_length)s caractères ou moins. Seulement lettres, nombres,"
+" et ., +, -, ou _."
+
+#: user/forms.py:69 user/forms.py:115
#: user/templates/ldt/user/change_profile.html:83
msgid "Language"
msgstr "Langue"
-#: user/forms.py:39 user/forms.py:75
+#: user/forms.py:70 user/forms.py:127
msgid "Profile picture"
msgstr "Image de profil"
-#: user/forms.py:48 user/forms.py:86
+#: user/forms.py:79 user/forms.py:138
#, python-format
msgid "Image size is limited to %s"
msgstr "La taille de l'image à limitée à %s"
-#: user/views.py:25
-msgid "Your profile has been updated."
-msgstr "Votre profil a été modifié"
+#: user/models.py:86
+msgid "username"
+msgstr "nom d'utilisateur"
+
+#: user/models.py:89
+#, python-format
+msgid "Required. %d characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "Obligatoire, %d caratères ou moins. Lettres, chiffres et seulement @/./+/-/_."
-#: user/views.py:48
-msgid "Your password has been updated."
-msgstr "Votre mot de passe a été mis à jour"
+#: user/models.py:93
+msgid ""
+"Enter a valid username. This value may contain only letters, numbers and @/./"
+"+/-/_ characters."
+msgstr ""
+"Entrez un caractère valide. Cette valeur oeut seulement contenir des lettes, "
+"nombres et les caractères @/./+/-/_."
+
+
+#: user/models.py:98
+msgid "A user with that username already exists."
+msgstr "Un utilisateur avec ce nom d'utilisateur existe déjà."
+
+#: user/models.py:101
+msgid "first name"
+msgstr "prénom"
+
+#: user/models.py:102
+msgid "last name"
+msgstr "nom"
-#: user/views.py:72
-msgid "Your profile picture has been updated."
-msgstr "Votre image de profil a été mise à jour"
+#: user/models.py:103
+msgid "external id"
+msgstr "id externe"
+
+#: user/models.py:104
+msgid "email address"
+msgstr "adresse email"
+
+#: user/models.py:106
+msgid "staff status"
+msgstr "statut équipe"
+
+#: user/models.py:108
+msgid "Designates whether the user can log into this admin site."
+msgstr "Indique si l'utilisateur peut se connecter au site d'administration"
-#: user/views.py:93 user/templates/registration/login.html:25
-msgid "Sorry, that's not a valid username or password."
-msgstr "Saisissez un nom d'utilisateur et un mot de passe valide."
+#: user/models.py:111
+msgid "active"
+msgstr "actif"
+
+#: user/models.py:114
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Indique si cet utilisateur peut être considéré comme actid. Déselectionnez"
+" ceci au lieu d'effacer le compte."
+
+#: user/models.py:118
+msgid "date joined"
+msgstr "date d'inscription"
+
+#: user/models.py:130
+msgid "users"
+msgstr "utilisateurs"
#: user/templates/ldt/user/change_password.html:31
msgid "Old password"
@@ -1777,12 +1886,16 @@
#: user/templates/registration/logged_out.html:8
msgid "Thanks for spending some quality time with the Web site today."
-msgstr ""
+msgstr "Merci de voptre visite."
#: user/templates/registration/logged_out.html:10
msgid "Log in again"
msgstr "Se reconnecter"
+#: user/templates/registration/login.html:25 user/views.py:96
+msgid "Sorry, that's not a valid username or password."
+msgstr "Saisissez un nom d'utilisateur et un mot de passe valide."
+
#: user/templates/registration/login.html:47
msgid "login"
msgstr "login"
@@ -1848,7 +1961,7 @@
#: user/templates/registration/password_reset_complete.html:12
msgid "Your password has been set. You may go ahead and log in now."
msgstr ""
-"Votre mot de passe a été défini. vous pouvez vous connecter maintenant."
+"Votre mot de passe a été défini. Vous pouvez vous connecter maintenant."
#: user/templates/registration/password_reset_confirm.html:15
msgid ""
@@ -1957,6 +2070,18 @@
"Nous vous avons envoyé par courriel les instructions pour activer le compte "
"à l'adresse que vous avez indiquée. Vous devriez le recevoir rapidement."
+#: user/views.py:28
+msgid "Your profile has been updated."
+msgstr "Votre profil a été modifié"
+
+#: user/views.py:51
+msgid "Your password has been updated."
+msgstr "Votre mot de passe a été mis à jour"
+
+#: user/views.py:75
+msgid "Your profile picture has been updated."
+msgstr "Votre image de profil a été mise à jour"
+
#~ msgid "annotation.tags"
#~ msgstr "tags"
@@ -1980,7 +2105,3 @@
#~ msgid "The two emails didn't match."
#~ msgstr "les deux emails ne correspondent pas"
-
-#, fuzzy
-#~ msgid "Last name"
-#~ msgstr "Nom"
--- a/src/ldt/ldt/locale/ja/LC_MESSAGES/django.po Thu Sep 10 12:06:56 2015 +0200
+++ b/src/ldt/ldt/locale/ja/LC_MESSAGES/django.po Tue Sep 15 17:28:56 2015 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-11 12:18+0000\n"
+"POT-Creation-Date: 2015-09-14 15:16+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -44,7 +44,7 @@
msgid "all"
msgstr "万事"
-#: ldt_utils/forms.py:34 ldt_utils/models.py:72
+#: ldt_utils/forms.py:34 ldt_utils/models.py:74
#: ldt_utils/templates/ldt/ldt_utils/content_list.html:70
msgid "title"
msgstr "題名"
@@ -69,7 +69,7 @@
msgid "Content Tag"
msgstr "Content Tag"
-#: ldt_utils/forms.py:53 ldt_utils/models.py:177
+#: ldt_utils/forms.py:53 ldt_utils/models.py:183
msgid "content.content_creation_date"
msgstr "作成日"
@@ -101,126 +101,122 @@
msgid "content.front_project"
msgstr "主なプロジェクト"
-#: ldt_utils/forms.py:58 ldt_utils/models.py:176
+#: ldt_utils/forms.py:58 ldt_utils/models.py:182
msgid "content.duration"
msgstr "ビデオ再生時間"
-#: ldt_utils/models.py:61
+#: ldt_utils/models.py:63
msgid "media.external_id"
msgstr "external id"
-#: ldt_utils/models.py:62
+#: ldt_utils/models.py:64
msgid "media.external_permalink"
msgstr "external permalink"
-#: ldt_utils/models.py:63
+#: ldt_utils/models.py:65
msgid "media.external_publication_url"
msgstr "external publication URL"
-#: ldt_utils/models.py:64
+#: ldt_utils/models.py:66
msgid "media.external_src_url"
msgstr "external source URL"
-#: ldt_utils/models.py:65
+#: ldt_utils/models.py:67
msgid "media.creation_date"
msgstr "作成日"
-#: ldt_utils/models.py:66
+#: ldt_utils/models.py:68
msgid "media.media_creation_date"
msgstr "メディアの作成日"
-#: ldt_utils/models.py:67
+#: ldt_utils/models.py:69
msgid "media.update_date"
msgstr "日付を更新"
-#: ldt_utils/models.py:68
+#: ldt_utils/models.py:70
msgid "media.videopath"
msgstr "videopath"
-#: ldt_utils/models.py:69
+#: ldt_utils/models.py:71
msgid "media.duration"
msgstr "ビデオ再生時間"
-#: ldt_utils/models.py:70
+#: ldt_utils/models.py:72
msgid "media.creator"
msgstr "クリエータ"
-#: ldt_utils/models.py:71
+#: ldt_utils/models.py:73
msgid "description"
msgstr "記述部"
-#: ldt_utils/models.py:73
+#: ldt_utils/models.py:75
msgid "media.src"
msgstr "source"
-#: ldt_utils/models.py:74
+#: ldt_utils/models.py:76
msgid "media.src_hash"
msgstr "source hash"
-#: ldt_utils/models.py:75
+#: ldt_utils/models.py:77
msgid "media.mimetype"
msgstr "MIMEタイプ"
-#: ldt_utils/models.py:169
+#: ldt_utils/models.py:175
msgid "content.iri_id"
msgstr "IRI id"
-#: ldt_utils/models.py:170
+#: ldt_utils/models.py:176
msgid "content.iriurl"
msgstr "IRI URL"
-#: ldt_utils/models.py:171
+#: ldt_utils/models.py:177
msgid "content.creation_date"
msgstr "作成日"
-#: ldt_utils/models.py:172
+#: ldt_utils/models.py:178
msgid "content.update_date"
msgstr "日付を更新"
-#: ldt_utils/models.py:173
+#: ldt_utils/models.py:179
msgid "content.title"
msgstr "題名"
-#: ldt_utils/models.py:174
+#: ldt_utils/models.py:180
msgid "content.description"
msgstr "記述部"
-#: ldt_utils/models.py:175
+#: ldt_utils/models.py:181
msgid "content.authors"
msgstr "著者ら"
-#: ldt_utils/models.py:550
+#: ldt_utils/models.py:555
msgid "content_stat.content"
msgstr "content"
-#: ldt_utils/models.py:551
+#: ldt_utils/models.py:556
msgid "content_stat.annotations_volume"
msgstr "annotation volume"
-#: ldt_utils/models.py:552
+#: ldt_utils/models.py:557
msgid "content_stat.polemics_volume"
msgstr "polemics volume"
-#: ldt_utils/models.py:553
+#: ldt_utils/models.py:558
msgid "content.nb_annotation"
msgstr "注解の数"
-#: ldt_utils/models.py:554
+#: ldt_utils/models.py:559
msgid "content.last_annotated"
msgstr "last annotated"
-#: ldt_utils/models.py:614
+#: ldt_utils/models.py:625
msgid "created by"
msgstr "によって作成された"
-#: ldt_utils/models.py:615
+#: ldt_utils/models.py:626
msgid "changed by"
msgstr "によって変更"
-#: ldt_utils/utils.py:205 ldt_utils/utils.py:388
-msgid "Personal cutting"
-msgstr "個人カット"
-
#: ldt_utils/templates/admin/ldt_utils/app_action.html:4
#: templates/admin/cms_change_list.html:7
#: templates/admin/page_app_index.html:8
@@ -473,10 +469,10 @@
#: ldt_utils/templates/ldt/ldt_utils/groups.html:130
#: ldt_utils/templates/ldt/ldt_utils/groups.html:142
#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:80
+#: ldt_utils/templates/ldt/ldt_utils/partial/permissions.html:133
#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:96
#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:107
#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:122
-#: ldt_utils/templates/ldt/ldt_utils/partial/permissions.html:133
#: templates/ldt/ldt_base.html:128
msgid "search"
msgstr "検索"
@@ -731,248 +727,294 @@
msgid "create_project"
msgstr "樹立"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:25
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:239
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:24
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:140
msgid "Show Player"
msgstr "ショープレーヤー"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:26
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:25
msgid "Hide Player"
msgstr "プレーヤーを隠す"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:61
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:62
#, fuzzy
msgid "Share the project"
msgstr "プロジェクトを作成する"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:62
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:63
#, fuzzy
msgid "List of the project's contents"
msgstr "clik here to see the project content"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:65
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:66
msgid "Link to the Metadata Player"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:65
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:70
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:66
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:71
#, fuzzy
msgid "See"
msgstr "選る"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:65
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:69
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:70
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:66
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:70
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:71
msgid "Select"
msgstr "選る"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:69
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:70
msgid "project id"
msgstr "project id"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:70
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:71
#, fuzzy
msgid "The project in Lignes de Temps"
msgstr "Display the results in Lignes De Temps"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:75
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:76
msgid "popup_player"
msgstr "プレーヤー"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:76
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:77
#, fuzzy
msgid "popup_ldt_iframe"
msgstr "プレーヤー"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:77
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:78
msgid "popup_seo_body"
msgstr "SEO code"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:78
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:79
msgid "popup_seo_meta"
msgstr "SEO meta"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:79
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:80
msgid "popup_links"
msgstr "Links"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:98
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:106
msgid "Integration mode"
msgstr "Integration mode"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:99
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:107
msgid "div"
msgstr "div"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:100
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:108
msgid "iframe"
msgstr "iframe"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:103
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:112
msgid "Player Size : "
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:110
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:119
#, fuzzy
msgid "Preset Modes"
msgstr "パスワードをリセットする"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:113
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:122
#, fuzzy
msgid "Basic configuration"
msgstr "新しいパスワードの確認"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:114
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:123
msgid "Polemic configuration"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:115
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:124
msgid "Polemic configuration with tagcloud, annotationsList and Social widgets"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:122
+#: ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html:131
#, fuzzy
msgid "Create your own configuration"
msgstr "Create your project"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:126
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:21
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:143
msgid "The video starts automatically"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:130
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:25
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:23
msgid "Displays a form to create a new annotation"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:133
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:28
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:26
#, fuzzy
msgid "audio annotation"
msgstr "URI"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:134
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:29
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:27
#, fuzzy
msgid "Audio annotation"
msgstr "URI"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:134
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:29
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:27
msgid "Allows the user to record an annotation"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:136
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:31
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:33
msgid "Use most used tags "
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:138
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:33
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:35
msgid "Set your own tags : "
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:138
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:33
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:35
msgid "Write your tags separeted by a comma"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:141
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:142
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:36
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:37
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:38
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:39
msgid "4 polemics buttons"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:142
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:37
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:39
msgid "Displays or removes the 4 polemics buttons"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:147
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:42
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:45
msgid "Displays segments of a media as rectangles on an horizontal line"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:150
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:46
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:56
msgid ""
"Displays every segment of a media as rectangles on multiple horizontal lines"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:153
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:50
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:60
msgid "Show a list of all annotations accross every project for this content"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:157
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:54
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:64
msgid ""
"Shows the polemical timeline, i.e. tweets colored according to the polemical "
"syntax"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:160
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:57
msgid "Display in the polemic timeline : "
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:161
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:58
msgid "only tweets"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:162
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:59
#, fuzzy
msgid "all annotations"
msgstr "タグ"
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:164
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:61
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:71
msgid "Personalize tweet's color"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:169
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:66
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:76
msgid "Default color"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:173
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:70
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:80
msgid "Polemic's color : ++ : "
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:183
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:80
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:90
msgid "Found color"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:191
-msgid "Displays a curve showing the volume of annotations across time"
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:88
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:98
+msgid "Displays a curve showing the project annotation volume across time"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:195
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:92
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:102
msgid "personalize sparkline's color"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:199
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:96
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:106
msgid "line color"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:204
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:101
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:111
msgid "fill color"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:211
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:108
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:118
msgid "Displays a div in order to watch the slides displayed in the media"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:215
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:112
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:122
msgid " Adds buttons to share an URL on social networks"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:222
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:119
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:129
msgid "share with email"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:226
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:123
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:133
msgid ""
" Displays information relative to a single segment/annotation while it is "
"being played"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:229
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:126
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:136
msgid "Show the contents on a tweet when clicked (in Polemic Widget)"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:232
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:129
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:139
msgid "Shows a tag cloud"
msgstr ""
-#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:234
+#: ldt_utils/templates/ldt/ldt_utils/embed/v1/mdplayer_config.html:131
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:146
#, fuzzy
msgid "Concatenate all projects using this content"
msgstr "You can't edit this content"
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:20
+msgid "Widgets"
+msgstr ""
+
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:30
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:49
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:68
+msgid ""
+"Display annotation types: (annotation types must be separated by commas, "
+"leave blank to display everything) "
+msgstr ""
+
+#: ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html:141
+msgid "Other settings"
+msgstr ""
+
#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:21
#: ldt_utils/templates/ldt/ldt_utils/error_confirm_popup.html:34
#: ldt_utils/templates/ldt/ldt_utils/reset_confirm.html:22
@@ -1025,67 +1067,6 @@
msgid "project list"
msgstr "プロジェクトリスト"
-#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:88
-msgid "Submit"
-msgstr "提出"
-
-#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:93
-#: templates/ldt/ldt_base.html:117
-msgid "Published projects"
-msgstr "Published projects"
-
-#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:94
-#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:120
-msgid "Create project"
-msgstr "プロジェクトを作成する"
-
-#: ldt_utils/templates/ldt/ldt_utils/reset_confirm.html:22
-msgid "confirm_reset"
-msgstr "確認するリセット"
-
-#: ldt_utils/templates/ldt/ldt_utils/search_form.html:10
-msgid "The search field can not be empty."
-msgstr "検索フィールドを空にすることはできません。"
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:62
-msgid "Results for "
-msgstr "Results for "
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:78
-msgid ""
-"Are you sure you want to delete this annotation ? You cannot undo this "
-"action."
-msgstr ""
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:78
-msgid "Delete permantly the current annotation"
-msgstr ""
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:80
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:26
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:28
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:31
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:38
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:40
-#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:43
-#: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:22
-#: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:24
-msgid "open ldt"
-msgstr "open ldt"
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:91
-msgid "Tags"
-msgstr "タグ"
-
-#: ldt_utils/templates/ldt/ldt_utils/search_results.html:110
-#, python-format
-msgid "Page %(number)s of %(num_pages)s"
-msgstr "Page %(number)s of %(num_pages)s"
-
-#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:103
-msgid "content list"
-msgstr "コンテンツリスト"
-
#: ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html:8
msgid "All categories"
msgstr "全部門"
@@ -1159,6 +1140,7 @@
#: ldt_utils/templates/ldt/ldt_utils/partial/permissions.html:169
#: ldt_utils/templates/ldt/ldt_utils/partial/sharewith.html:7
+#: user/models.py:129
msgid "user"
msgstr "ユーザー"
@@ -1186,6 +1168,18 @@
msgid "Upload a new picture"
msgstr "Upload a new picture"
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:26
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:28
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:31
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:38
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:40
+#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:43
+#: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:22
+#: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:24
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:80
+msgid "open ldt"
+msgstr "open ldt"
+
#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:48
msgid "copy project"
msgstr "copy project"
@@ -1217,62 +1211,115 @@
msgid "Project published"
msgstr "プロジェクトが公開され"
-#: ldt_utils/views/content.py:130
+#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:88
+msgid "Submit"
+msgstr "提出"
+
+#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:93
+#: templates/ldt/ldt_base.html:117
+msgid "Published projects"
+msgstr "Published projects"
+
+#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:94
+#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:120
+msgid "Create project"
+msgstr "プロジェクトを作成する"
+
+#: ldt_utils/templates/ldt/ldt_utils/reset_confirm.html:22
+msgid "confirm_reset"
+msgstr "確認するリセット"
+
+#: ldt_utils/templates/ldt/ldt_utils/search_form.html:10
+msgid "The search field can not be empty."
+msgstr "検索フィールドを空にすることはできません。"
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:62
+msgid "Results for "
+msgstr "Results for "
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:78
+msgid ""
+"Are you sure you want to delete this annotation ? You cannot undo this "
+"action."
+msgstr ""
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:78
+msgid "Delete permantly the current annotation"
+msgstr ""
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:91
+msgid "Tags"
+msgstr "タグ"
+
+#: ldt_utils/templates/ldt/ldt_utils/search_results.html:110
+#, python-format
+msgid "Page %(number)s of %(num_pages)s"
+msgstr "Page %(number)s of %(num_pages)s"
+
+#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:103
+msgid "content list"
+msgstr "コンテンツリスト"
+
+#: ldt_utils/utils.py:316 ldt_utils/utils.py:499
+msgid "Personal cutting"
+msgstr "個人カット"
+
+#: ldt_utils/views/content.py:131
msgid "Problem when downloading file from url : "
msgstr "Problem when downloading file from url: "
-#: ldt_utils/views/content.py:133
+#: ldt_utils/views/content.py:134
msgid "Problem when uploading file : "
msgstr "Problem when uploading file: "
-#: ldt_utils/views/content.py:358
+#: ldt_utils/views/content.py:338
#, python-format
msgid "There is %(count)d error when deleting content"
msgid_plural "There are %(count)d errors when deleting content"
msgstr[0] "There is %(count)d error when deleting content"
msgstr[1] "There are %(count)d errors when deleting content"
-#: ldt_utils/views/content.py:359
+#: ldt_utils/views/content.py:339
msgid "title error deleting content"
msgstr "error deleting content"
-#: ldt_utils/views/content.py:364
+#: ldt_utils/views/content.py:344
#, python-format
msgid "Confirm delete content %(titles)s"
msgstr "Confirm delete content %(titles)s"
-#: ldt_utils/views/content.py:365
+#: ldt_utils/views/content.py:345
msgid "confirm delete content"
msgstr "confirm delete content"
-#: ldt_utils/views/content.py:376
+#: ldt_utils/views/content.py:356
#, python-format
msgid "Please unpublish the front project %(title)s"
msgstr "Please unpublish the front project %(title)s"
-#: ldt_utils/views/content.py:377
+#: ldt_utils/views/content.py:357
msgid "The front project is published"
msgstr "The front project is published"
-#: ldt_utils/views/content.py:378 ldt_utils/views/content.py:381
-#: ldt_utils/views/project.py:139
+#: ldt_utils/views/content.py:358 ldt_utils/views/content.py:361
+#: ldt_utils/views/project.py:141
msgid "confirm reset"
msgstr "confirm reset"
-#: ldt_utils/views/content.py:380 ldt_utils/views/project.py:138
+#: ldt_utils/views/content.py:360 ldt_utils/views/project.py:140
#, python-format
msgid "please confirm reseting project %(title)s"
msgstr "please confirm reseting project %(title)s"
-#: ldt_utils/views/content.py:407
+#: ldt_utils/views/content.py:387
msgid "An error occurred - Please try again or contact webmaster"
msgstr "An error occurred - Please try again or contact webmaster"
-#: ldt_utils/views/content.py:408
+#: ldt_utils/views/content.py:388
msgid "Error"
msgstr "エラー"
-#: ldt_utils/views/content.py:453
+#: ldt_utils/views/content.py:433
#, python-format
msgid ""
"Content '%(title)s' is referenced by this project : %(project_titles)s. "
@@ -1287,7 +1334,7 @@
"Content '%(title)s' is referenced by %(count)d projects: %(project_titles)s. "
"Please delete them beforehand."
-#: ldt_utils/views/content.py:456
+#: ldt_utils/views/content.py:436
#, python-format
msgid ""
"The project '%(project_title)s' pointing on the content '%(title)s' has "
@@ -1298,24 +1345,34 @@
"several annotations. Do you want to delete the content and the project "
"anyway ?"
-#: ldt_utils/views/json.py:43 ldt_utils/views/rdf.py:15
+#: ldt_utils/views/embed/meta.py:64 ldt_utils/views/embed/v2/views.py:31
+msgid ""
+"The content does not exists or you are not allowed to access this content"
+msgstr ""
+"The content does not exists or you are not allowed to access this content"
+
+#: ldt_utils/views/embed/meta.py:68 ldt_utils/views/embed/v2/views.py:35
+msgid "Parameters project_id or content_id must be given in the url"
+msgstr "Parameters project_id or content_id must be given in the url"
+
+#: ldt_utils/views/ldt_json.py:46 ldt_utils/views/rdf.py:15
msgid "You can not access this project"
msgstr "You can not access this project"
-#: ldt_utils/views/project.py:119
+#: ldt_utils/views/project.py:121
#, python-format
msgid "the project %(title)s is published. please unpublish before deleting."
msgstr "the project %(title)s is published. please unpublish before deleting."
-#: ldt_utils/views/project.py:120 ldt_utils/views/project.py:124
+#: ldt_utils/views/project.py:122 ldt_utils/views/project.py:126
msgid "can not delete the project. Please correct the following error"
msgstr "can not delete the project. Please correct the following error"
-#: ldt_utils/views/project.py:121 ldt_utils/views/project.py:125
+#: ldt_utils/views/project.py:123 ldt_utils/views/project.py:127
msgid "title error deleting project"
msgstr "Error deleting project"
-#: ldt_utils/views/project.py:123
+#: ldt_utils/views/project.py:125
#, python-format
msgid ""
"the project %(title)s is the front project of %(content)s. please delete "
@@ -1324,36 +1381,26 @@
"the project %(title)s is the front project of %(content)s. please delete "
"this content first."
-#: ldt_utils/views/project.py:127
+#: ldt_utils/views/project.py:129
#, python-format
msgid "please confirm deleting project %(title)s"
msgstr "please confirm deleting project %(title)s"
-#: ldt_utils/views/project.py:128
+#: ldt_utils/views/project.py:130
msgid "confirm deletion"
msgstr "confirm deletion"
-#: ldt_utils/views/workspace.py:118
-msgid ""
-"The content does not exists or you are not allowed to access this content"
-msgstr ""
-"The content does not exists or you are not allowed to access this content"
-
-#: ldt_utils/views/workspace.py:122
-msgid "Parameters project_id or content_id must be given in the url"
-msgstr "Parameters project_id or content_id must be given in the url"
-
-#: ldt_utils/views/workspace.py:438
+#: ldt_utils/views/workspace.py:237
#, fuzzy
msgid "Annotation not found in the xml"
msgstr "All annotations on the media"
-#: ldt_utils/views/workspace.py:449
+#: ldt_utils/views/workspace.py:248
#, fuzzy
msgid "Annotation not found"
msgstr "All annotations on the media"
-#: ldt_utils/views/workspace.py:451 ldt_utils/views/workspace.py:453
+#: ldt_utils/views/workspace.py:250 ldt_utils/views/workspace.py:252
msgid "Project not found"
msgstr ""
@@ -1655,40 +1702,106 @@
msgid "annotation.update_date"
msgstr "日付を更新"
-#: user/admin.py:20
+#: user/admin.py:28
#, fuzzy
msgid "profile"
msgstr "Profiles"
-#: user/forms.py:38 user/forms.py:63
+#: user/forms.py:52 user/forms.py:93 user/forms.py:109
+#, python-format
+msgid ""
+"Required, %(username_length)s characters or fewer. Only letters, numbers, "
+"and @, ., +, -, or _ characters."
+msgstr ""
+
+#: user/forms.py:69 user/forms.py:115
#: user/templates/ldt/user/change_profile.html:83
msgid "Language"
msgstr "言語"
-#: user/forms.py:39 user/forms.py:75
+#: user/forms.py:70 user/forms.py:127
msgid "Profile picture"
msgstr "プロフィールの写真"
-#: user/forms.py:48 user/forms.py:86
+#: user/forms.py:79 user/forms.py:138
#, python-format
msgid "Image size is limited to %s"
msgstr "Image size is limited to %s"
-#: user/views.py:25
-msgid "Your profile has been updated."
-msgstr "あなたのプロフィールが更新されました。"
+#: user/models.py:86
+#, fuzzy
+#| msgid "Username"
+msgid "username"
+msgstr "ユーザ名"
+
+#: user/models.py:89
+#, python-format
+msgid "Required. %d characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
-#: user/views.py:48
-msgid "Your password has been updated."
-msgstr "あなたのパスワードが更新されました。"
+#: user/models.py:93
+msgid ""
+"Enter a valid username. This value may contain only letters, numbers and @/./"
+"+/-/_ characters."
+msgstr ""
+
+#: user/models.py:98
+msgid "A user with that username already exists."
+msgstr ""
+
+#: user/models.py:101
+#, fuzzy
+#| msgid "First name"
+msgid "first name"
+msgstr "名"
+
+#: user/models.py:102
+#, fuzzy
+#| msgid "Last name"
+msgid "last name"
+msgstr "姓"
-#: user/views.py:72
-msgid "Your profile picture has been updated."
-msgstr "あなたのプロフィールの写真が更新されました。"
+#: user/models.py:103
+#, fuzzy
+#| msgid "media.external_id"
+msgid "external id"
+msgstr "external id"
+
+#: user/models.py:104
+msgid "email address"
+msgstr ""
+
+#: user/models.py:106
+#, fuzzy
+#| msgid "Page states"
+msgid "staff status"
+msgstr "Page states"
+
+#: user/models.py:108
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
-#: user/views.py:93 user/templates/registration/login.html:25
-msgid "Sorry, that's not a valid username or password."
-msgstr "Sorry, that's not a valid username or password."
+#: user/models.py:111
+#, fuzzy
+#| msgid "active since"
+msgid "active"
+msgstr "以来、積極的な"
+
+#: user/models.py:114
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: user/models.py:118
+msgid "date joined"
+msgstr ""
+
+#: user/models.py:130
+#, fuzzy
+#| msgid "user"
+msgid "users"
+msgstr "ユーザー"
#: user/templates/ldt/user/change_password.html:31
msgid "Old password"
@@ -1801,6 +1914,10 @@
msgid "Log in again"
msgstr "再度ログイン"
+#: user/templates/registration/login.html:25 user/views.py:96
+msgid "Sorry, that's not a valid username or password."
+msgstr "Sorry, that's not a valid username or password."
+
#: user/templates/registration/login.html:47
msgid "login"
msgstr "ログイン"
@@ -1971,6 +2088,18 @@
"We've e-mailed you instructions for activate your account to the e-mail "
"address you submitted. You should be receiving it shortly."
+#: user/views.py:28
+msgid "Your profile has been updated."
+msgstr "あなたのプロフィールが更新されました。"
+
+#: user/views.py:51
+msgid "Your password has been updated."
+msgstr "あなたのパスワードが更新されました。"
+
+#: user/views.py:75
+msgid "Your profile picture has been updated."
+msgstr "あなたのプロフィールの写真が更新されました。"
+
#~ msgid "Search results for "
#~ msgstr "Search results for "
@@ -2001,8 +2130,5 @@
#~ msgid "The two emails didn't match."
#~ msgstr "The two emails didn't match."
-#~ msgid "Last name"
-#~ msgstr "姓"
-
#~ msgid "Use the iframe integration mode"
#~ msgstr "Use the iframe integration mode"
--- a/src/ldt/ldt/static/ldt/css/ldtform.css Thu Sep 10 12:06:56 2015 +0200
+++ b/src/ldt/ldt/static/ldt/css/ldtform.css Tue Sep 15 17:28:56 2015 +0200
@@ -241,3 +241,89 @@
#moreoptionscontainer {
display: none;
}
+
+/*-------------------------
+ Help text
+-------------------------*/
+
+/*.helptext {
+ position: absolute;
+ top: 18px;
+ right: 18px;
+ text-align: center;
+ background-color: #BCDBEA;
+ border-radius: 50%;
+ width: 24px;
+ height: 24px;
+ font-size: 14px;
+ line-height: 26px;
+ cursor: default;
+}*/
+
+input:hover + .helptext {
+ display:block;
+ transform-origin: 100% 0%;
+
+ -webkit-animation: fadeIn 0.3s ease-in-out;
+ animation: fadeIn 0.3s ease-in-out;
+
+}
+
+ul#login_fields_list > li {
+ position: relative
+}
+
+.helptext {
+ display: none;
+ text-align: left;
+ background-color: #1E2021;
+ padding: 20px;
+ width: 300px;
+
+ position: absolute;
+ top: 5px;
+ left: 75%;
+ border-radius: 3px;
+ box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
+ right: -4px;
+ color: #FFF;
+ font-size: 13px;
+ line-height: 1.4;
+}
+
+/*.helptext::before{
+ position: absolute;
+ content: '';
+ width:0;
+ height: 0;
+ border:6px solid transparent;
+ border-bottom-color:#1E2021;
+ right:10px;
+ top:-12px;
+}*/
+
+/*.helptext::after{
+ width:100%;
+ height:40px;
+ content:'';
+ position: absolute;
+ top:-40px;
+ left:0;
+}*/
+
+@-webkit-keyframes fadeIn {
+ 0% {
+ opacity:0;
+ transform: scale(0.6);
+ }
+
+ 100% {
+ opacity:100%;
+ transform: scale(1);
+ }
+}
+
+@keyframes fadeIn {
+ 0% { opacity:0; }
+ 100% { opacity:100%; }
+}
\ No newline at end of file
--- a/src/ldt/ldt/user/__init__.py Thu Sep 10 12:06:56 2015 +0200
+++ b/src/ldt/ldt/user/__init__.py Tue Sep 15 17:28:56 2015 +0200
@@ -1,1 +1,5 @@
+#
+MAX_USERNAME_LENGTH = 50
+MAX_FIRST_NAME_LENGTH = 150
+MAX_LAST_NAME_LENGTH = 150
\ No newline at end of file
--- a/src/ldt/ldt/user/forms.py Thu Sep 10 12:06:56 2015 +0200
+++ b/src/ldt/ldt/user/forms.py Tue Sep 15 17:28:56 2015 +0200
@@ -1,12 +1,31 @@
+import os
+
from django import forms
from django.conf import settings
from django.contrib.auth import get_user_model
-from django.contrib.auth.forms import UserCreationForm, UserChangeForm
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm,\
+ AuthenticationForm
from django.contrib.auth.models import Group
+from django.core.validators import MaxLengthValidator
from django.utils.translation import gettext as _
-import os
+from ldt.user import MAX_USERNAME_LENGTH, MAX_FIRST_NAME_LENGTH,\
+ MAX_LAST_NAME_LENGTH
+
User = get_user_model()
+
+def update_field_length(field, length, help_text=None):
+ field.widget.attrs['maxlength'] = length
+ field.max_length = length
+ if help_text:
+ field.help_text = help_text
+
+ # we need to find the MaxLengthValidator and change its
+ # limit_value otherwise the auth forms will fail validation
+ for v in field.validators:
+ if isinstance(v, MaxLengthValidator):
+ v.limit_value = length
+
class ProfileForm(UserChangeForm):
@@ -25,6 +44,19 @@
model = User
fields = ('username', 'email', 'first_name', 'last_name', 'password')
+ def __init__(self, *args, **kwargs):
+ super(UserCreationForm, self).__init__(*args, **kwargs)
+ update_field_length(
+ self.fields['username'],
+ MAX_USERNAME_LENGTH,
+ _("Required, %(username_length)s characters or fewer. Only letters, "
+ "numbers, and @, ., +, -, or _ "
+ "characters.") % {'username_length' : MAX_USERNAME_LENGTH})
+ if 'first_name' in self.fields:
+ update_field_length(self.fields['first_name'], MAX_FIRST_NAME_LENGTH, None)
+ if 'last_name' in self.fields:
+ update_field_length(self.fields['last_name'], MAX_LAST_NAME_LENGTH, None)
+
def clean_username(self):
# Since User.username is unique, this check is redundant,
# but it sets a nicer error message than the ORM. See #13147.
@@ -33,7 +65,7 @@
User.objects.get(username=username)
except User.DoesNotExist:
return username
- raise forms.ValidationError(self.error_messages['duplicate_username'])
+ raise forms.ValidationError(self.error_messages['duplicate_username'])
class AdminUserChangeForm(UserChangeForm):
language = forms.ChoiceField(label=_("Language"), choices=[(k,_(v)) for k,v in settings.LANGUAGES], initial=settings.LANGUAGE_CODE[:2])
@@ -55,12 +87,32 @@
return image
-
+ def __init__(self, *args, **kwargs):
+ super(UserCreationForm, self).__init__(*args, **kwargs)
+ update_field_length(
+ self.fields['username'],
+ MAX_USERNAME_LENGTH,
+ _("Required, %(username_length)s characters or fewer. Only letters, "
+ "numbers, and @, ., +, -, or _ "
+ "characters.") % {'username_length' : MAX_USERNAME_LENGTH})
+ update_field_length(self.fields['first_name'], MAX_FIRST_NAME_LENGTH, None)
+ update_field_length(self.fields['last_name'], MAX_LAST_NAME_LENGTH, None)
+
class Meta:
model = User
fields = ('username', 'email', 'first_name', 'last_name', 'password')
-
-
+
+class AdminAuthenticationForm(AuthenticationForm):
+ def __init__(self, *args, **kwargs):
+ super(AdminAuthenticationForm, self).__init__(*args, **kwargs)
+ update_field_length(
+ self.fields['username'],
+ MAX_USERNAME_LENGTH,
+ _("Required, %(username_length)s characters or fewer. Only letters, "
+ "numbers, and @, ., +, -, or _ "
+ "characters.") % {'username_length' : MAX_USERNAME_LENGTH})
+
+
class LanguageChangeForm(forms.Form):
language = forms.ChoiceField(label=_("Language"), choices=settings.LANGUAGES)
@@ -117,5 +169,4 @@
img_container.save()
return self.model
-
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ldt/ldt/user/migrations/0002_resize_user_fields_add_external_id.py Tue Sep 15 17:28:56 2015 +0200
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import django.core.validators
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('user', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='ldtuser',
+ name='external_id',
+ field=models.CharField(max_length=50, verbose_name='external id', blank=True),
+ ),
+ migrations.AlterField(
+ model_name='ldtuser',
+ name='first_name',
+ field=models.CharField(max_length=150, verbose_name='first name', blank=True),
+ ),
+ migrations.AlterField(
+ model_name='ldtuser',
+ name='last_name',
+ field=models.CharField(max_length=150, verbose_name='last name', blank=True),
+ ),
+ migrations.AlterField(
+ model_name='ldtuser',
+ name='username',
+ field=models.CharField(error_messages={b'unique': 'A user with that username already exists.'}, max_length=50, validators=[django.core.validators.RegexValidator(b'^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.')], help_text='Required. 50 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True, verbose_name='username'),
+ ),
+ ]
--- a/src/ldt/ldt/user/models.py Thu Sep 10 12:06:56 2015 +0200
+++ b/src/ldt/ldt/user/models.py Tue Sep 15 17:28:56 2015 +0200
@@ -1,14 +1,18 @@
from django.conf import settings
from django.contrib.auth import models as auth_models
-from django.contrib.auth.models import (AbstractUser, UserManager, Group,
- BaseUserManager, Permission)
+from django.contrib.auth.models import (UserManager, Group,
+ BaseUserManager, Permission, AbstractBaseUser, PermissionsMixin)
from django.contrib.contenttypes.models import ContentType
+from django.core import validators
+from django.core.mail import send_mail
from django.db import models
+from django.db.models.signals import post_migrate
from django.db.models.signals import post_save
from django.utils import timezone
+from django.utils.translation import ugettext_lazy as _
from sorl.thumbnail import ImageField
-from django.db.models.signals import post_migrate
+from ldt.user import MAX_USERNAME_LENGTH, MAX_FIRST_NAME_LENGTH, MAX_LAST_NAME_LENGTH
class LdtUserManager(BaseUserManager):
@@ -71,12 +75,77 @@
else :
return 'en'
-class LdtUser(AbstractUser):
+
+class LdtUser(AbstractBaseUser, PermissionsMixin):
+ """
+ An abstract base class implementing a fully featured User model with
+ admin-compliant permissions.
+ Username and password are required. Other fields are optional.
+ """
+ username = models.CharField(
+ _('username'),
+ max_length=MAX_USERNAME_LENGTH,
+ unique=True,
+ help_text=_('Required. %d characters or fewer. Letters, digits and @/./+/-/_ only.' % MAX_USERNAME_LENGTH),
+ validators=[
+ validators.RegexValidator(
+ r'^[\w.@+-]+$',
+ _('Enter a valid username. This value may contain only '
+ 'letters, numbers ' 'and @/./+/-/_ characters.')
+ ),
+ ],
+ error_messages={
+ 'unique': _("A user with that username already exists."),
+ },
+ )
+ first_name = models.CharField(_('first name'), max_length=MAX_FIRST_NAME_LENGTH, blank=True)
+ last_name = models.CharField(_('last name'), max_length=MAX_LAST_NAME_LENGTH, blank=True)
+ external_id = models.CharField(_('external id'), max_length=MAX_USERNAME_LENGTH, blank=True)
+ email = models.EmailField(_('email address'), blank=True)
+ is_staff = models.BooleanField(
+ _('staff status'),
+ default=False,
+ help_text=_('Designates whether the user can log into this admin site.'),
+ )
+ is_active = models.BooleanField(
+ _('active'),
+ default=True,
+ help_text=_(
+ 'Designates whether this user should be treated as active. '
+ 'Unselect this instead of deleting accounts.'
+ ),
+ )
+ date_joined = models.DateTimeField(_('date joined'), default=timezone.now)
+
language = models.CharField(max_length=2, default=get_ldtuser_language_default)
image = ImageField(upload_to="thumbnails/users/", default=get_ldtuser_image_default, max_length=200)
-
+
objects = LdtUserManager()
-
+
+ USERNAME_FIELD = 'username'
+ REQUIRED_FIELDS = ['email']
+
+ class Meta:
+ verbose_name = _('user')
+ verbose_name_plural = _('users')
+
+ def get_full_name(self):
+ """
+ Returns the first_name plus the last_name, with a space in between.
+ """
+ full_name = '%s %s' % (self.first_name, self.last_name)
+ return full_name.strip()
+
+ def get_short_name(self):
+ "Returns the short name for the user."
+ return self.first_name
+
+ def email_user(self, subject, message, from_email=None, **kwargs):
+ """
+ Sends an email to this User.
+ """
+ send_mail(subject, message, from_email, [self.email], **kwargs)
+
def get_profile(self):
return self.profile