8 files changed, 20 insertions, 20 deletions
diff --git a/mediagoblin/plugins/custom_subtitles/__init__.py b/mediagoblin/plugins/subtitles/__init__.py
index f2adc47b..75b0dbc4 100644
--- a/mediagoblin/plugins/custom_subtitles/__init__.py
+++ b/mediagoblin/plugins/subtitles/__init__.py
@@ -20,18 +20,18 @@ import os
 PLUGIN_DIR = os.path.dirname(__file__)
 
 def setup_plugin():
-    config = pluginapi.get_config('mediagoblin.plugins.custom_subtitles')
+    config = pluginapi.get_config('mediagoblin.plugins.subtitles')
 
     routes = [
-        ('mediagoblin.plugins.custom_subtitles.customize',
+        ('mediagoblin.plugins.subtitles.customize',
          '/u/<string:user>/m/<int:media_id>/customize/<string:path>',
-         'mediagoblin.plugins.custom_subtitles.views:custom_subtitles'),
-        ('mediagoblin.plugins.custom_subtitles.subtitles',
+         'mediagoblin.plugins.subtitles.views:custom_subtitles'),
+        ('mediagoblin.plugins.subtitles.subtitles',
          '/u/<string:user>/m/<int:media_id>/subtitles/',
-         'mediagoblin.plugins.custom_subtitles.views:edit_subtitles'),
-        ('mediagoblin.plugins.custom_subtitles.delete_subtitles',
+         'mediagoblin.plugins.subtitles.views:edit_subtitles'),
+        ('mediagoblin.plugins.subtitles.delete_subtitles',
          '/u/<string:user>/m/<int:media_id>/delete/<string:path>',
-         'mediagoblin.plugins.custom_subtitles.views:delete_subtitles')]
+         'mediagoblin.plugins.subtitles.views:delete_subtitles')]
 
     pluginapi.register_routes(routes)
 
@@ -39,9 +39,9 @@ def setup_plugin():
     pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates'))
 
     pluginapi.register_template_hooks(
-        {"customize_subtitles": "mediagoblin/plugins/custom_subtitles/custom_subtitles.html",
-         "add_subtitles": "mediagoblin/plugins/custom_subtitles/subtitles.html",
-         "subtitle_sidebar": "mediagoblin/plugins/custom_subtitles/subtitle_media_block.html"})
+        {"customize_subtitles": "mediagoblin/plugins/subtitles/custom_subtitles.html",
+         "add_subtitles": "mediagoblin/plugins/subtitles/subtitles.html",
+         "subtitle_sidebar": "mediagoblin/plugins/subtitles/subtitle_media_block.html"})
 
 
 
diff --git a/mediagoblin/plugins/custom_subtitles/forms.py b/mediagoblin/plugins/subtitles/forms.py
index 69afd6e7..69afd6e7 100644
--- a/mediagoblin/plugins/custom_subtitles/forms.py
+++ b/mediagoblin/plugins/subtitles/forms.py
diff --git a/mediagoblin/plugins/custom_subtitles/models.py b/mediagoblin/plugins/subtitles/models.py
index 4ff57b8d..4ff57b8d 100644
--- a/mediagoblin/plugins/custom_subtitles/models.py
+++ b/mediagoblin/plugins/subtitles/models.py
diff --git a/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/custom_subtitles.html b/mediagoblin/plugins/subtitles/templates/mediagoblin/plugins/subtitles/custom_subtitles.html
index e1975c75..2184b85e 100644
--- a/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/custom_subtitles.html
+++ b/mediagoblin/plugins/subtitles/templates/mediagoblin/plugins/subtitles/custom_subtitles.html
@@ -28,14 +28,14 @@
           request.staticdirect('/css/subtitles.css') }}"
         rel="stylesheet">
 
-  <form action="{{ request.urlgen('mediagoblin.plugins.custom_subtitles.customize',
+  <form action="{{ request.urlgen('mediagoblin.plugins.subtitles.customize',
                             user=media.get_actor.username,
                             media_id=media.id,
                             path=path) }}" method="POST" enctype="multipart/form-data">
     <div class="form_box edit_box">
       {{ wtforms_util.render_divs(form) }}
       <div class="form_submit_buttons">
-        {% set delete_url = request.urlgen('mediagoblin.plugins.custom_subtitles.delete_subtitles',
+        {% set delete_url = request.urlgen('mediagoblin.plugins.subtitles.delete_subtitles',
                                    user= media.get_actor.username,
                                    media_id=media.id,
                                    path=path) %}
diff --git a/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/subtitle_media_block.html b/mediagoblin/plugins/subtitles/templates/mediagoblin/plugins/subtitles/subtitle_media_block.html
index 3e6bf886..b516655a 100644
--- a/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/subtitle_media_block.html
+++ b/mediagoblin/plugins/subtitles/templates/mediagoblin/plugins/subtitles/subtitle_media_block.html
@@ -23,7 +23,7 @@
         <ul>
           {%- for subtitle in media.subtitle_files %}
             <li>
-                <a href="{{ request.urlgen('mediagoblin.plugins.custom_subtitles.customize',
+                <a href="{{ request.urlgen('mediagoblin.plugins.subtitles.customize',
                             user=media.get_actor.username,
                             media_id=media.id,
                             path=subtitle.filepath) }}">
@@ -39,7 +39,7 @@
           <h3>{% trans %}Subtitles{% endtrans %}</h3>
         {%- endif %}
         <p>
-          <a href="{{ request.urlgen('mediagoblin.plugins.custom_subtitles.subtitles',
+          <a href="{{ request.urlgen('mediagoblin.plugins.subtitles.subtitles',
                         user=media.get_actor.username,
                         media_id=media.id) }}">
             {%- trans %}Add subtitle {% endtrans -%}
@@ -47,4 +47,4 @@
         </p>
       {%- endif %}
     {% endif %}
-{% endblock %}
+{% endblock %}
+\ No newline at end of file
diff --git a/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/subtitles.html b/mediagoblin/plugins/subtitles/templates/mediagoblin/plugins/subtitles/subtitles.html
index daf05c11..cf689eed 100644
--- a/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/subtitles.html
+++ b/mediagoblin/plugins/subtitles/templates/mediagoblin/plugins/subtitles/subtitles.html
@@ -26,7 +26,7 @@
 {%- endblock %}
 
 {% block mediagoblin_content %}
-  <form action="{{ request.urlgen('mediagoblin.plugins.custom_subtitles.subtitles',
+  <form action="{{ request.urlgen('mediagoblin.plugins.subtitles.subtitles',
                                user= media.get_actor.username,
                                media_id=media.id) }}"
         method="POST" enctype="multipart/form-data">
diff --git a/mediagoblin/plugins/custom_subtitles/tools.py b/mediagoblin/plugins/subtitles/tools.py
index f947ba92..f947ba92 100644
--- a/mediagoblin/plugins/custom_subtitles/tools.py
+++ b/mediagoblin/plugins/subtitles/tools.py
diff --git a/mediagoblin/plugins/custom_subtitles/views.py b/mediagoblin/plugins/subtitles/views.py
index 36db2e8b..b9d82ef3 100644
--- a/mediagoblin/plugins/custom_subtitles/views.py
+++ b/mediagoblin/plugins/subtitles/views.py
@@ -25,7 +25,7 @@ from werkzeug.utils import secure_filename
 from mediagoblin import messages
 from mediagoblin import mg_globals
 
-from mediagoblin.plugins.custom_subtitles import forms
+from mediagoblin.plugins.subtitles import forms
 from mediagoblin.decorators import (require_active_login, active_user_from_url,
                             get_media_entry_by_id, user_may_delete_media)
 from mediagoblin.tools.metadata import (compact_and_validate, DEFAULT_CHECKER,
@@ -35,7 +35,7 @@ from mediagoblin.tools.response import (render_to_response,
 
 import mimetypes
 
-from mediagoblin.plugins.custom_subtitles.tools import open_subtitle,save_subtitle,get_path
+from mediagoblin.plugins.subtitles.tools import open_subtitle,save_subtitle,get_path
 
 UNSAFE_MIMETYPES = [
         'text/html',
@@ -108,7 +108,7 @@ def edit_subtitles(request, media):
                         location=media.url_for_self(request.urlgen))
     return render_to_response(
         request,
-        'mediagoblin/plugins/custom_subtitles/subtitles.html',
+        'mediagoblin/plugins/subtitles/subtitles.html',
         {'media': media,
          'form': form})
 
@@ -134,7 +134,7 @@ def custom_subtitles(request,media,path=None):
 
     return render_to_response(
         request,
-        "mediagoblin/plugins/custom_subtitles/custom_subtitles.html",
+        "mediagoblin/plugins/subtitles/custom_subtitles.html",
         {"path": path,
          "media": media,
          "form": form })