Proper titles for all pages. **compilemessages**

ODNZSL · Apr 16, 2018 · cd238ab · cd238ab
1 parent b365b49
commit cd238ab
Show file tree

Hide file tree

Showing 22 changed files with 475 additions and 329 deletions.
diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
diff --git a/signbank/dictionary/templates/dictionary/admin_gloss_list.html b/signbank/dictionary/templates/dictionary/admin_gloss_list.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load staticfiles %}
 {# Translators: Title for sign search page #}
-{% block bootstrap3_title %}: {% blocktrans %}Search Signs{% endblocktrans %}{% endblock %}
+{% block bootstrap3_title %}{% blocktrans %}Advanced Search{% endblocktrans %} | {% endblock %}
 {% block extrahead %}
 <link rel="stylesheet" href="{% static "css/jquery-ui/jquery-ui.min.css" %}">
 {% endblock %}

diff --git a/signbank/dictionary/templates/dictionary/admin_glossrelation_list.html b/signbank/dictionary/templates/dictionary/admin_glossrelation_list.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load staticfiles %}
 {# Translators: Title for GlossRelation search page #}
-{% block bootstrap3_title %}: {% blocktrans %}Search Relations of Glosses{% endblocktrans %}{% endblock %}
+{% block bootstrap3_title %}{% blocktrans %}Search Gloss Relations{% endblocktrans %} | {% endblock %}
 {% block extrajs %}
 <script>
 // http://www.javascript-coder.com/javascript-form/javascript-reset-form.phtml

diff --git a/signbank/dictionary/templates/dictionary/create_gloss.html b/signbank/dictionary/templates/dictionary/create_gloss.html
@@ -2,6 +2,7 @@
 {% load stylesheet %}
 {% load bootstrap3 %}
 {% load i18n %}
+{% block bootstrap3_title %}{% blocktrans %}Create Gloss{% endblocktrans %} | {% endblock %}
 
 {% block content %}
     {% if perms.dictionary.add_gloss %}

diff --git a/signbank/dictionary/templates/dictionary/gloss_detail.html b/signbank/dictionary/templates/dictionary/gloss_detail.html
@@ -3,6 +3,7 @@
 {% load bootstrap3 %}
 {% load i18n %}
 {% load staticfiles %}
+{% block bootstrap3_title %}{{gloss}} [{{gloss.dataset}}] | {% endblock %}
 {% block extrahead %}
 <link rel="stylesheet" type="text/css" href="{% static 'css/tagmanager.css' %}">
 <link rel="stylesheet" type="text/css" href="{% static 'css/jquery.atwho.min.css' %}">

diff --git a/signbank/dictionary/templates/dictionary/import_csv.html b/signbank/dictionary/templates/dictionary/import_csv.html
@@ -2,6 +2,7 @@
 {% load stylesheet %}
 {% load bootstrap3 %}
 {% load i18n %}
+{% block bootstrap3_title %}{% blocktrans %}Import CSV{% endblocktrans %} | {% endblock %}
 
 {% block content %}
 

diff --git a/signbank/dictionary/templates/dictionary/import_gloss_csv.html b/signbank/dictionary/templates/dictionary/import_gloss_csv.html
@@ -2,6 +2,7 @@
 {% load stylesheet %}
 {% load bootstrap3 %}
 {% load i18n %}
+{% block bootstrap3_title %}{% blocktrans %}Import CSV{% endblocktrans %} | {% endblock %}
 
 {% block content %}
     {% if perms.dictionary.import_csv %}

diff --git a/signbank/dictionary/templates/dictionary/import_gloss_csv_confirmation.html b/signbank/dictionary/templates/dictionary/import_gloss_csv_confirmation.html
@@ -2,6 +2,7 @@
 {% load stylesheet %}
 {% load bootstrap3 %}
 {% load i18n %}
+{% block bootstrap3_title %}{% blocktrans %}Confirm Import CSV{% endblocktrans %} | {% endblock %}
 
 {% block content %}
 {% if perms.dictionary.import_csv %}

diff --git a/signbank/dictionary/templates/dictionary/public_gloss_detail.html b/signbank/dictionary/templates/dictionary/public_gloss_detail.html
@@ -2,6 +2,7 @@
 {% load i18n %}
 {% load comments %}
 {% load tagging_tags %}
+{% block bootstrap3_title %}{{gloss}} [{{gloss.dataset.description}}] | {% endblock %}
 {% block content %}
 <div class="container">
 <div class="row">

diff --git a/signbank/dictionary/templates/dictionary/public_gloss_list.html b/signbank/dictionary/templates/dictionary/public_gloss_list.html
@@ -2,6 +2,7 @@
 {% load i18n %}
 {% load bootstrap3 %}
 {% load staticfiles %}
+{% block bootstrap3_title %}{% blocktrans %}Search Signs{% endblocktrans %} | {% endblock %}
 {% block extrajs %}
 <script src="{% static "js/mark.min.js" %}"></script>
 <script>

diff --git a/signbank/video/templates/addvideos.html b/signbank/video/templates/addvideos.html
@@ -1,5 +1,6 @@
 {% extends "baselayout.html" %}
 {% load i18n %}
+{% block bootstrap3_title %}{% blocktrans %}Upload Videos{% endblocktrans %} | {% endblock %}
 
 {%block extrahead %}
 <script>

diff --git a/signbank/video/templates/uploaded_glossvideos.html b/signbank/video/templates/uploaded_glossvideos.html
@@ -1,12 +1,13 @@
 {% extends "baselayout.html" %}
 {% load i18n %}
 {% load staticfiles %}
+{% block bootstrap3_title %}{% blocktrans %}Manage Uploaded Videos{% endblocktrans %} | {% endblock %}
 {% block extrahead %}
 <link rel="stylesheet" href="{% static "css/jquery-ui/jquery-ui.min.css" %}">
 {% endblock %}
 {% block content %}
 <div class="page-header">
-  <h2>{% blocktrans %}Uploaded Glossvideos{% endblocktrans %} <small>{% blocktrans %}Connect Glossvideos to Glosses{% endblocktrans %}</small></h2>
+  <h2>{% blocktrans %}Manage Uploaded Videos{% endblocktrans %} <small>{% blocktrans %}Connect Glossvideos to Glosses{% endblocktrans %}</small></h2>
 </div>
 <div id="dataset" class="panel panel-default">
     <div class="panel-body">

diff --git a/templates/baselayout.html b/templates/baselayout.html
@@ -6,7 +6,7 @@
 {% get_current_language as LANGUAGE_CODE %}
 <html lang="{{LANGUAGE_CODE|default:'en'}}">
   <head>
-    <title>{% blocktrans %}Finnish Signbank{% endblocktrans %}{% block bootstrap3_title %}{% endblock %}</title>
+    <title>{% block bootstrap3_title %}{% endblock %}{% blocktrans %}Finnish Signbank{% endblocktrans %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta charset="UTF-8">
     <link rel="stylesheet" media="screen" href="{% static 'bootstrap/css/bootstrap.min.css' %}">

diff --git a/templates/comments/latest_comments_page.html b/templates/comments/latest_comments_page.html
@@ -1,5 +1,6 @@
 {% extends "baselayout.html" %}
 {% load i18n %}
+{% block bootstrap3_title %}{% blocktrans %}Latest Comments{% endblocktrans %} | {% endblock %}
 {% block content %}
 {% include "comments/latest_comments.html" %}
 {% endblock %}
diff --git a/templates/comments/search_comments.html b/templates/comments/search_comments.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load staticfiles %}
 {# Translators: Title for comments search page #}
-{% block bootstrap3_title %}: {% blocktrans %}Search Comments{% endblocktrans %}{% endblock %}
+{% block bootstrap3_title %}{% blocktrans %}Search Comments{% endblocktrans %} | {% endblock %}
 {% block content %}
 <div class="search_comments">
     <h2><a href="{% url 'search_comments' %}">{% blocktrans %}Search comments{% endblocktrans %}</a></h2>

diff --git a/templates/flatpages/default.html b/templates/flatpages/default.html
@@ -1,5 +1,6 @@
 {% extends "baselayout.html" %}
 {% load i18n %}
+{% block bootstrap3_title %}{{flatpage.title}} | {% endblock %}
 
 {% block content %}
 {% block pagecontent %}

diff --git a/templates/infopage.html b/templates/infopage.html
@@ -2,6 +2,7 @@
 {% load stylesheet %}
 {% load bootstrap3 %}
 {% load i18n %}
+{% block bootstrap3_title %}{% blocktrans %}Links and Statistics{% endblocktrans %} | {% endblock %}
 {% block content %}
     {% if perms.dictionary.search_gloss %}
     <div id="infopage" class="container-fluid">

diff --git a/templates/registration/activate.html b/templates/registration/activate.html
@@ -1,7 +1,7 @@
 {% extends "registration/registration_base.html" %}
 {% load i18n %}
 
-{% block title %}{% trans "Activation Failure" %}{% endblock %}
+{% block bootstrap3_title %}{% blocktrans %}Activation Failure{% endblocktrans %} | {% endblock %}
 
 {% block content %}
 <div class="alert alert-danger" role="alert">

diff --git a/templates/registration/activation_complete.html b/templates/registration/activation_complete.html
@@ -1,7 +1,7 @@
 {% extends "registration/registration_base.html" %}
 {% load i18n %}
 
-{% block title %}{% trans "Activation Complete" %}{% endblock %}
+{% block bootstrap3_title %}{% blocktrans %}Activation Complete{% endblocktrans %} | {% endblock %}
 
 {% block content %}
 <div class="alert alert-success" role="alert">

diff --git a/templates/registration/login.html b/templates/registration/login.html
@@ -2,7 +2,7 @@
 {% load bootstrap3 %}
 {% load i18n %}
 
-{% block title %}{% trans "Sign in" %}{% endblock %}
+{% block bootstrap3_title %}{% blocktrans %}Sign In{% endblocktrans %} | {% endblock %}
 
 {% block content %}
 {# Translators: Text sign in - Log in form #}

diff --git a/templates/registration/logout.html b/templates/registration/logout.html
@@ -1,7 +1,7 @@
 {% extends "registration/registration_base.html" %}
 {% load i18n %}
 
-{% block title %}{% trans "Logged out" %}{% endblock %}
+{% block bootstrap3_title %}{% blocktrans %}Logged Out{% endblocktrans %} | {% endblock %}
 
 {% block content %}
 <div class="alert alert-info" role="alert">

diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html
@@ -2,7 +2,7 @@
 {% load bootstrap3 %}
 {% load i18n %}
 
-{% block title %}{% trans "Create an account" %}{% endblock %}
+{% block bootstrap3_title %}{% blocktrans %}Create an Account{% endblocktrans %} | {% endblock %}
 
 {% block content %}
 {% if not user.is_authenticated %}