Anonymous avatar Anonymous committed 48f3b59

Correction on the past work

Comments (0)

Files changed (6)

lodgeit/views/compare_paste.html

 {% block body %}
   <p>
     Differences between the pastes
-    <a href="{{ url(('pastes/show_paste', identifier=new.identifier) }}">#{{ new.identifier }}</a> ({{ new.pub_date|datetimeformat }})
-    and <a href="{{ url('pastes/show_paste', identifier=old.identifier) }}">#{{ old.identifier }}</a> ({{ old.pub_date|datetimeformat }}). Download as <a href="{{ url('pastes/unidiff_paste', new_id=new.identifier, old_id=old.identifier) }}/">unified diff</a>.
+    <a href="{{ url('pastes/show_paste', identifier=new.identifier) }}">#{{ new.identifier }}</a> ({{ new.pub_date|datetimeformat }})
+    and <a href="{{ url('pastes/show_paste', identifier=old.identifier) }}">#{{ old.identifier }}</a> ({{ old.pub_date|datetimeformat }}). Download as <a href="{{ url('pastes/unidiff_paste', new_id=new.identifier, old_id=old.identifier) }}">unified diff</a>.
   </p>
   {% if diff.chunks %}
     {{ render_diff_part(diff) }}
   {% else %}
-    <p>The two pastes are identical.</p>
+    <p>{% trans %}The two pastes are identical.{% endtrans %}</p>
   {% endif %}
 {% endblock %}

lodgeit/views/help/layout.html

   <ul id="help-navigation">
   {%- for topic, title in help_topics %}
     <li{% if current_topic == topic %} class="active"{% endif
-      %}><a href="{{ url('static/help', topic=topic) }}/">{{ title|e }}</a></li>
+      %}><a href="{{ url('static/help', topic=topic) }}">{{ title|e }}</a></li>
   {%- endfor %}
   </ul>
   <div class="text">

lodgeit/views/help/pasting.html

 {% extends "help/layout.html" %}
 {% block help_body %}
   <h3>{% trans %}Creating New Pastes{% endtrans %}</h3>
-  <p>{% trans %}
+  <p>{% trans url=url('pastes/new_paste') %}
     If you use the web interface to create new pastes the process is
-    straightforward. All you have to do is to click on the <a href="/">new</a>
+    straightforward. All you have to do is to click on the <a href="{{ url }}">new</a>
     tab and fill in the text field. Additionally you should select a proper
     highlighter from the list below to make it easier to read your paste.{% endtrans %}
   </p>
     A new editor window will open with the contents of the old paste. Just
     do your changes and click "paste" to submit them.{% endtrans %}
   </p>
-  <p>{% trans %}
+  <p>{% trans url=url('static/help', topic='advanced') %}
     If you use the reply feature a link to the parent paste is created
     automatically. This allows you to compare those two pastes with one
     click to find changes easily. For information about the diff view
-    head over to the <a href="{{ url('static/help', topic='advanced') }}">advanced features</a> page.{% endtrans %}
+    head over to the <a href="{{ url }}">advanced features</a> page.{% endtrans %}
   </p>
 {% endblock %}

lodgeit/views/new_paste.html

       <label for="insert_tabs_input">{% trans
         %}Tab-key inserts tabstops{% endtrans %}</label>
     </span>
-    <div id="multi-file-information">{% trans %}
+    <div id="multi-file-information">{% trans url=url('static/help', topic='advacnced') %}
       You have selected the multi-file highlighter.  This highlighter allows
       you to paste multiple different files that belong together.  For more
-      information have a look at <a href="{{ url('static/help', topic='advanced') }}">the advanced
+      information have a look at <a href="{{ url }}">the advanced
       features help page</a>.
     {% endtrans %}</div>
   </form>

lodgeit/views/not_found.html

   <p>
     {% trans %}Sorry, but the page you requested was not found on this server.{% endtrans %}
   </p>
-  <p>{% trans %}
+  <p>{% trans url=url('static/about') %}
     We've recently updated this pastebin. While it is out goal for nothing to get
     lost, you may have found a page that was mis-placed. Check your URL to ensure
     you have gone where you intended. If everything looks OK and you still see
-    this error page, please consider <a href="{{ url('static/about') }}">contacting us</a>.{% endtrans %}
+    this error page, please consider <a href="{{ url }}">contacting us</a>.{% endtrans %}
   </p>
   <p>
-    {% trans %}Click <a href="{{ url('pastes/new_paste') }}">here</a> to add a new paste.{% endtrans %}
+    {% trans url=url('pastes/new_paste') %}Click <a href="{{ url }}">here</a> to add a new paste.{% endtrans %}
   </p>
 {% endblock %}

lodgeit/views/show_paste.html

       <ul>
         <li><a class="autoclose" href="{{ url('pastes/new_paste', reply_to=paste.identifier) }}">{% trans %}reply to this paste{% endtrans %}</a></li>
         {% if paste.parent %}
-          <li><a class="autoclose" href="{{ url('pastes/compare_paste', new_id=paste.identifier, old_id=paste.parent.identifier) }}/">{% trans %}compare it with the parent paste{% endtrans %}</a></li>
+          <li><a class="autoclose" href="{{ url('pastes/compare_paste', new_id=paste.identifier, old_id=paste.parent.identifier) }}">{% trans %}compare it with the parent paste{% endtrans %}</a></li>
           <li><a class="autoclose" href="{{ paste.parent.url|e }}">{% trans %}look at the parent paste{% endtrans %}</a></li>
         {% endif %}
         {% if paste.children %}
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.