fix trans

diff --git a/teleforma/htdocs/css/teleforma_black.css b/teleforma/htdocs/css/teleforma_black.css
index 2cb119c6585d57f365eae48915a20f51a4214879..fa9cb622a9c57e62a2c48901dc3f7db87c772e24 100644 (file)
--- a/teleforma/htdocs/css/teleforma_black.css
+++ b/teleforma/htdocs/css/teleforma_black.css
@@ -1152,7 +1152,7 @@ a.image-link {
 
 
 #action_red {
-    background-color:  #dd4b39;
+    background-color:  #d24836;
     color: #FFF;
     padding:0.8em 0.8em 0.8em 0.8em;
     }

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po
index 7be6279c7e8e24b806e2871a86fa4b0678a85870..2764dc286c70afc7e4ad90383b1bc1a7c8757b62 100644 (file)
--- a/teleforma/locale/fr/LC_MESSAGES/django.po
+++ b/teleforma/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-11 10:01+0200\n"
+"POT-Creation-Date: 2012-04-12 11:24+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"
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Trash"
 msgstr ""
 
-#: templates/postman/base.html:23
+#: templates/postman/base.html:23 templates/telemeta/users.html:29
 msgid "New message"
 msgstr "Nouveau message"
 
@@ -344,20 +344,28 @@ msgstr ""
 msgid "You have received a message from the user '%(sender)s'."
 msgstr ""
 
-#: templates/postman/email_user.txt:17 templates/postman/email_visitor.txt:14
+#: templates/postman/email_user.txt:15
+msgid ""
+"You can read and respond to this message from your e-learning desk following "
+"this link:"
+msgstr ""
+"Vous pouvez lire et répondre à ce message depuis votre bureau e-learning en "
+"suivant ce lien :"
+
+#: templates/postman/email_user.txt:18 templates/postman/email_visitor.txt:14
 msgid "Thank you again for your interest in our services."
 msgstr ""
 
-#: templates/postman/email_user.txt:18 templates/postman/email_visitor.txt:16
+#: templates/postman/email_user.txt:19 templates/postman/email_visitor.txt:16
 msgid "The site administrator"
 msgstr ""
 
-#: templates/postman/email_user.txt:18
+#: templates/postman/email_user.txt:19
 #: templates/telemeta/inc/user_list.html:10
 msgid "of"
 msgstr "de"
 
-#: templates/postman/email_user.txt:20 templates/postman/email_visitor.txt:18
+#: templates/postman/email_user.txt:21 templates/postman/email_visitor.txt:18
 msgid ""
 "Note: This message is issued by an automated system.\n"
 "Do not reply, this would not be taken into account."
@@ -525,8 +533,8 @@ msgstr ""
 msgid "Messages"
 msgstr "Messages"
 
-#: templates/telemeta/base.html:74 templates/telemeta/users.html:5
-#: templates/telemeta/users.html.py:35
+#: templates/telemeta/base.html:74 templates/telemeta/users.html:6
+#: templates/telemeta/users.html.py:43
 msgid "Users"
 msgstr ""
 
@@ -593,15 +601,15 @@ msgstr ""
 msgid "Legal notices"
 msgstr ""
 
-#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:42
-msgid "Musical selection"
+#: templates/telemeta/home.html:26
+msgid "Connexion"
 msgstr ""
 
-#: templates/telemeta/users.html:14
+#: templates/telemeta/users.html:15
 msgid "Trainings"
 msgstr "Formations"
 
-#: templates/telemeta/users.html:39
+#: templates/telemeta/users.html:48
 #, fuzzy
 msgid "No users"
 msgstr "Pas d'utilisateurs"

diff --git a/teleforma/templates/postman/base.html b/teleforma/templates/postman/base.html
index aea8d35697269ab2c8b09289cbabc09472f39b9c..93d06e4de5587c654938d71b869e4d943b2ed619 100644 (file)
--- a/teleforma/templates/postman/base.html
+++ b/teleforma/templates/postman/base.html
@@ -20,7 +20,7 @@
 </div>
 </div>
 <div class="module_action">
-<a href="{% url postman_write %}" class="component_icon button" id="action_green">{% trans "New message" %}</a>
+<a href="{% url postman_write %}" class="component_icon button" id="action_red">{% trans "New message" %}</a>
 </div>
 </div>
 

diff --git a/teleforma/templates/postman/email_user.txt b/teleforma/templates/postman/email_user.txt
index c9da23b0e230b3bda3b74148e4595b8d945a0c3e..46bb1cae366a8165bcdc162cdfd239d4a1c49c11 100644 (file)
--- a/teleforma/templates/postman/email_user.txt
+++ b/teleforma/templates/postman/email_user.txt
@@ -11,9 +11,10 @@
 {% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a copy of a response from the user '{{ sender }}'.{% endblocktrans %}
 {% endif %}
 {% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a message from the user '{{ sender }}'.{% endblocktrans %}
-{% endif %}{% endif %}{# 'acceptance' #}{% trans "You can read and respond to this message from your online desk" %}:
+{% endif %}{% endif %}
+{% trans "You can read and respond to this message from your e-learning desk following this link:" %}
 http://{{ site.name }}/messages/inbox/
-
+{# 'acceptance' #}
 {% trans "Thank you again for your interest in our services." %}
 {% trans "The site administrator" %} {% trans "of" %} {% organization %}
 

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 5909bd14cd7ca3925bf3bb5c93d4c95ee786a56e..076ff5eb5c1e6cae29bd96faa74dd2f8f290b667 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -60,23 +60,23 @@ alt="Telemeta Powered"/>-->
 </div>
 
  {% if user.is_authenticated %}
- <li><a href="{% url teleforma-courses %}" class="blue">{% trans "Desk" %}</a>
+ <li><a href="{% url teleforma-courses %}" class="violet">{% trans "Desk" %}</a>
  </li>
  {% else %}
-  <li><a href="{% url telemeta-home %}" class="blue">{% trans "Home" %}</a></li>
-  <li><a href="{% url telemeta-login %}" class="red">{% trans "Sign in" %}</a></li>
+  <li><a href="{% url telemeta-home %}" class="violet">{% trans "Home" %}</a></li>
+  <li><a href="{% url telemeta-login %}" class="blue">{% trans "Sign in" %}</a></li>
  {% endif %}
 
  {% if user.is_authenticated %}
 
- <li><a href="/messages" class="green">{% trans "Messages" %}{% if postman_unread_count %} ({{ postman_unread_count }}){% endif %}</a></li>
+ <li><a href="/messages" class="red">{% trans "Messages" %}{% if postman_unread_count %} ({{ postman_unread_count }}){% endif %}</a></li>
 
- <li><a href="{% url teleforma-users %}" class="yellow">{% trans "Users" %}</a></li>
+ <li><a href="{% url teleforma-users %}" class="orange">{% trans "Users" %}</a></li>
 
- <li><a href="{% url telemeta-search-criteria %}" class="orange">{% trans "Search" %}</a></li>
+ <li><a href="{% url telemeta-search-criteria %}" class="yellow">{% trans "Search" %}</a></li>
 
  {% if user.is_staff %}
- <li><a href="#archives#" class="red">{% trans "Archives" %}</a>
+ <li><a href="#archives#" class="green">{% trans "Archives" %}</a>
  <ul>
  <li><a href="{% url telemeta-fonds %}">{% trans "Fonds" %}</a></li>
  <li><a href="{% url telemeta-corpus %}">{% trans "Corpus" %}</a></li>
@@ -86,11 +86,11 @@ alt="Telemeta Powered"/>-->
  </li>
 
  {% else %}
-  <li><a href="{% url telemeta-flatpage "help" %}" class="red">{% trans "Help" %}</a></li>
+  <li><a href="{% url telemeta-flatpage "help" %}" class="green">{% trans "Help" %}</a></li>
  {% endif %}
 
  {% if user.is_authenticated %}
- <li><a href="#profil#" class="violet"><img src="{% url telemeta-images "user_tr.png" %}" alt="user" style="vertical-align:middle" width="13px" />{% if user.first_name and user.last_name %}
+ <li><a href="#profil#" class="blue"><img src="{% url telemeta-images "user_tr.png" %}" alt="user" style="vertical-align:middle" width="13px" />{% if user.first_name and user.last_name %}
  {{ user.first_name }} {{ user.last_name }}
  {% else %}
  {{ user.username }}
@@ -106,7 +106,7 @@ alt="Telemeta Powered"/>-->
  </li>
 
  {% if user.is_staff %}
- <li><a href="#admin#" class="violet">{% trans "Admin" %}</a>
+ <li><a href="#admin#" class="blue">{% trans "Admin" %}</a>
   <ul>
     <li><a href="{% url telemeta-admin-general %}">{% trans "General" %}</a></li>
   </ul>

diff --git a/teleforma/templates/telemeta/inc/user_list.html b/teleforma/templates/telemeta/inc/user_list.html
index 1b11c1a4cc84dd80ea3398209df4b3f3b5d0d0fa..d115cffe4e80a43ad9c38da963e71bc523d9d465 100644 (file)
--- a/teleforma/templates/telemeta/inc/user_list.html
+++ b/teleforma/templates/telemeta/inc/user_list.html
@@ -55,7 +55,7 @@
         <td></td>
 
     {% endif %}
-    <td><a href="{% url postman_write user.username %}" class="component_icon button" id="action_green">{% trans "Message" %}</a></td>
+    <td><a href="{% url postman_write user.username %}" class="component_icon button" id="action_red">{% trans "Message" %}</a></td>
     </tr>
     {% endfor %}
     </tbody>

diff --git a/teleforma/templates/telemeta/users.html b/teleforma/templates/telemeta/users.html
index cbea2e08587bb21d1c638fbcd79251971c0a4e87..ab97b5a4e3935a17853a1e04f52936ac77ca79a4 100644 (file)
--- a/teleforma/templates/telemeta/users.html
+++ b/teleforma/templates/telemeta/users.html
@@ -26,7 +26,7 @@
 
 {% if users %}
 <div class="module_action">
-<a href="{% url postman_write all_users|to_recipients %}" class="component_icon button" id="action_green">{% trans "New message" %}</a>
+<a href="{% url postman_write all_users|to_recipients %}" class="component_icon button" id="action_red">{% trans "New message" %}</a>
 </div>
 {% endif %}