13 files changed, 64 insertions, 12 deletions
diff --git a/mediagoblin.ini b/mediagoblin.ini
index ba7df36a..0cf5a158 100644
--- a/mediagoblin.ini
+++ b/mediagoblin.ini
@@ -33,5 +33,4 @@ base_url = /mgoblin_media/
 
 # place plugins here---each in their own subsection of [plugins]. see
 # documentation for details.
-#[plugins]
-
+[plugins]
diff --git a/mediagoblin/gmg_commands/theme.py b/mediagoblin/gmg_commands/theme.py
index fd914a96..71abb982 100644
--- a/mediagoblin/gmg_commands/theme.py
+++ b/mediagoblin/gmg_commands/theme.py
@@ -50,7 +50,7 @@ def link_assets(theme, link_dir, printer=simple_printer):
     which should be printable.
     """
     link_dir = link_dir.rstrip(os.path.sep)
-    link_parent_dir = os.path.split(link_dir)[0]
+    link_parent_dir = os.path.dirname(link_dir)
 
     results = []
 
diff --git a/mediagoblin/templates/mediagoblin/admin/panel.html b/mediagoblin/templates/mediagoblin/admin/panel.html
index 0da3c18f..d3c6c958 100644
--- a/mediagoblin/templates/mediagoblin/admin/panel.html
+++ b/mediagoblin/templates/mediagoblin/admin/panel.html
@@ -17,6 +17,10 @@
 #}
 {% extends "mediagoblin/base.html" %}
 
+{% block title -%}
+  {% trans %}Media processing panel{% endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
 
 <h1>{% trans %}Media processing panel{% endtrans %}</h1>
@@ -41,7 +45,7 @@
         <td>{{ media_entry._id }}</td>
         <td>{{ media_entry.get_uploader.username }}</td>
         <td>{{ media_entry.title }}</td>
-        <td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td>
+        <td>{{ media_entry.created.strftime("%F %R") }}</td>
         {% if media_entry.transcoding_progress %}
           <td>{{ media_entry.transcoding_progress }}%</td>
         {% else %}
@@ -71,7 +75,7 @@
         <td>{{ media_entry._id }}</td>
         <td>{{ media_entry.get_uploader.username }}</td>
         <td>{{ media_entry.title }}</td>
-        <td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td>
+        <td>{{ media_entry.created.strftime("%F %R") }}</td>
         {% if media_entry.get_fail_exception() %}
         <td>{{ media_entry.get_fail_exception().general_message }}</td>
         <td>{{ media_entry.fail_metadata }}</td>
@@ -100,7 +104,7 @@
         <td>{{ media_entry._id }}</td>
         <td>{{ media_entry.get_uploader.username }}</td>
         <td><a href="{{ media_entry.url_for_self(request.urlgen) }}">{{ media_entry.title }}</a></td>
-        <td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td>
+        <td>{{ media_entry.created.strftime("%F %R") }}</td>
       </tr>
     {% endfor %}
   </table>
diff --git a/mediagoblin/templates/mediagoblin/auth/forgot_password.html b/mediagoblin/templates/mediagoblin/auth/forgot_password.html
index 672e9d9a..46aeddef 100644
--- a/mediagoblin/templates/mediagoblin/auth/forgot_password.html
+++ b/mediagoblin/templates/mediagoblin/auth/forgot_password.html
@@ -19,6 +19,10 @@
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
+{% block title -%}
+  {% trans %}Recover password{% endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
   <form action="{{ request.urlgen('mediagoblin.auth.forgot_password') }}"
         method="POST" enctype="multipart/form-data">
diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index 8161ea9d..4a39059d 100644
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -24,6 +24,10 @@
           src="{{ request.staticdirect('/js/autofilledin_password.js') }}"></script>
 {% endblock %}
 
+{% block title -%}
+  {% trans %}Log in{% endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
   <form action="{{ request.urlgen('mediagoblin.auth.login') }}"
         method="POST" enctype="multipart/form-data">
diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html
index 39c9efff..a2505cb9 100644
--- a/mediagoblin/templates/mediagoblin/auth/register.html
+++ b/mediagoblin/templates/mediagoblin/auth/register.html
@@ -24,6 +24,10 @@
           src="{{ request.staticdirect('/js/show_password.js') }}"></script>
 {% endblock mediagoblin_head %}
 
+{% block title -%}
+  {% trans %}Create an account!{% endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
 
   <form action="{{ request.urlgen('mediagoblin.auth.register') }}"
diff --git a/mediagoblin/templates/mediagoblin/edit/attachments.html b/mediagoblin/templates/mediagoblin/edit/attachments.html
index 580127fb..ee9d5cb7 100644
--- a/mediagoblin/templates/mediagoblin/edit/attachments.html
+++ b/mediagoblin/templates/mediagoblin/edit/attachments.html
@@ -18,13 +18,23 @@
 {% extends "mediagoblin/base.html" %}
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
+
+{% block title -%}
+  {% trans media_title=media.title -%}
+      Editing attachments for {{ media_title }}
+  {%- endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
   <form action="{{ request.urlgen('mediagoblin.edit.attachments',
                                user= media.get_uploader.username,
                                media= media._id) }}"
         method="POST" enctype="multipart/form-data">
     <div class="form_box">
-      <h1>Editing attachments for {{ media.title }}</h1>
+      <h1>
+        {% trans media_title=media.title -%}
+          Editing attachments for {{ media_title }}
+        {%- endtrans %}</h1>
       <div style="text-align: center;" >
         <img src="{{ request.app.public_store.file_url(
                          media.media_files['thumb']) }}" />
diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html
index 3f7cbe0e..3e305ae0 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@ -19,6 +19,12 @@
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
+{% block title -%}
+  {% trans media_title=media.title -%}
+    Editing {{ media_title }}
+  {%- endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
 
   <form action="{{ request.urlgen('mediagoblin.edit.edit_media',
diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html
index 1d80debc..9bacb157 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_account.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html
@@ -24,6 +24,13 @@
           src="{{ request.staticdirect('/js/show_password.js') }}"></script>
 {% endblock mediagoblin_head %}
 
+{% block title -%}
+  {% trans username=user.username -%}
+    Changing {{ username }}'s account settings
+  {%- endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
+
 {% block mediagoblin_content %}
 
   <form action="{{ request.urlgen('mediagoblin.edit.account') }}?username={{ 
diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
index 90862a4f..2b2fa4fa 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_profile.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
@@ -19,6 +19,12 @@
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
+{% block title -%}
+  {% trans username=user.username -%}
+    Editing {{ username }}'s profile
+  {%- endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
 
   <form action="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{ 
diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html
index 31163384..aa390f56 100644
--- a/mediagoblin/templates/mediagoblin/submit/start.html
+++ b/mediagoblin/templates/mediagoblin/submit/start.html
@@ -19,6 +19,10 @@
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
+{% block title -%}
+  {% trans %}Add your media{% endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
   <form action="{{ request.urlgen('mediagoblin.submit.start') }}"
         method="POST" enctype="multipart/form-data">
diff --git a/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html b/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
index ecbfb409..e673902b 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
@@ -17,6 +17,10 @@
 #}
 {% extends "mediagoblin/base.html" %}
 
+{% block title -%}
+  {% trans %}Media processing panel{% endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
 
 <h1>{% trans %}Media processing panel{% endtrans %}</h1>
@@ -39,7 +43,7 @@
       <tr>
         <td>{{ media_entry._id }}</td>
         <td>{{ media_entry.title }}</td>
-        <td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td>
+        <td>{{ media_entry.created.strftime("%F %R") }}</td>
         {% if media_entry.transcoding_progress %}
         <td>{{ media_entry.transcoding_progress }}%</td>
         {% else %}
@@ -67,7 +71,7 @@
       <tr>
         <td>{{ media_entry._id }}</td>
         <td>{{ media_entry.title }}</td>
-        <td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td>
+        <td>{{ media_entry.created.strftime("%F %R") }}</td>
         {% if media_entry.get_fail_exception() %}
         <td>{{ media_entry.get_fail_exception().general_message }}</td>
         <td>{{ media_entry.fail_metadata }}</td>
@@ -95,7 +99,7 @@
       <tr>
         <td>{{ entry._id }}</td>
         <td><a href="{{ entry.url_for_self(request.urlgen) }}">{{ entry.title }}</a></td>
-        <td>{{ entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td>
+        <td>{{ entry.created.strftime("%F %R") }}</td>
       </tr>
     {% endfor %}
   </table>
diff --git a/mediagoblin/tools/translate.py b/mediagoblin/tools/translate.py
index 65f636bb..5ab62a07 100644
--- a/mediagoblin/tools/translate.py
+++ b/mediagoblin/tools/translate.py
@@ -32,7 +32,7 @@ TRANSLATIONS_PATH = pkg_resources.resource_filename(
 
 def locale_to_lower_upper(locale):
     """
-    Take a locale, regardless of style, and format it like "en-us"
+    Take a locale, regardless of style, and format it like "en-US"
     """
     if '-' in locale:
         lang, country = locale.split('-', 1)
@@ -46,7 +46,7 @@ def locale_to_lower_upper(locale):
 
 def locale_to_lower_lower(locale):
     """
-    Take a locale, regardless of style, and format it like "en_US"
+    Take a locale, regardless of style, and format it like "en_us"
     """
     if '_' in locale:
         lang, country = locale.split('_', 1)