heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move comment form below comments.

Browse Source
This commit is contained in:
Aaron Williamson 2011-10-03 21:32:36 -04:00
parent 4d7a93a493
commit b7206469fa
2 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2011-09-25 20:26-0500\n" "POT-Creation-Date: 2011-10-03 21:29-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -41,75 +41,75 @@ msgstr ""
msgid "Email address" msgid "Email address"
msgstr "" msgstr ""
#: mediagoblin/auth/views.py:42 #: mediagoblin/auth/views.py:55
msgid "Sorry, registration is disabled on this instance." msgid "Sorry, registration is disabled on this instance."
msgstr "" msgstr ""
#: mediagoblin/auth/views.py:60 #: mediagoblin/auth/views.py:73
msgid "Sorry, a user with that name already exists." msgid "Sorry, a user with that name already exists."
msgstr "" msgstr ""
#: mediagoblin/auth/views.py:64 #: mediagoblin/auth/views.py:77
msgid "Sorry, that email address has already been taken." msgid "Sorry, that email address has already been taken."
msgstr "" msgstr ""
#: mediagoblin/auth/views.py:165 #: mediagoblin/auth/views.py:179
msgid "" msgid ""
"Your email address has been verified. You may now login, edit your " "Your email address has been verified. You may now login, edit your "
"profile, and submit images!" "profile, and submit images!"
msgstr "" msgstr ""
#: mediagoblin/auth/views.py:171 #: mediagoblin/auth/views.py:185
msgid "The verification key or user id is incorrect" msgid "The verification key or user id is incorrect"
msgstr "" msgstr ""
#: mediagoblin/auth/views.py:192 #: mediagoblin/auth/views.py:207
msgid "Resent your verification email." msgid "Resent your verification email."
msgstr "" msgstr ""
#: mediagoblin/auth/views.py:228 #: mediagoblin/auth/views.py:248
msgid "" msgid ""
"Could not send password recovery email as your username is inactive or " "Could not send password recovery email as your username is inactive or "
"your account's email address has not been verified." "your account's email address has not been verified."
msgstr "" msgstr ""
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27 #: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
msgid "Title" msgid "Title"
msgstr "" msgstr ""
#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:32 #: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:32
msgid "Tags" msgid "Tags"
msgstr "" msgstr ""
#: mediagoblin/edit/forms.py:33 #: mediagoblin/edit/forms.py:31
msgid "Slug" msgid "Slug"
msgstr "" msgstr ""
#: mediagoblin/edit/forms.py:34 #: mediagoblin/edit/forms.py:32
msgid "The slug can't be empty" msgid "The slug can't be empty"
msgstr "" msgstr ""
#: mediagoblin/edit/forms.py:35 #: mediagoblin/edit/forms.py:33
msgid "The title part of this media's URL. You usually don't need to change this." msgid "The title part of this media's URL. You usually don't need to change this."
msgstr "" msgstr ""
#: mediagoblin/edit/forms.py:42 #: mediagoblin/edit/forms.py:40
msgid "Bio" msgid "Bio"
msgstr "" msgstr ""
#: mediagoblin/edit/forms.py:45 #: mediagoblin/edit/forms.py:43
msgid "Website" msgid "Website"
msgstr "" msgstr ""
#: mediagoblin/edit/views.py:63 #: mediagoblin/edit/views.py:64
msgid "An entry with that slug already exists for this user." msgid "An entry with that slug already exists for this user."
msgstr "" msgstr ""
#: mediagoblin/edit/views.py:84 #: mediagoblin/edit/views.py:85
msgid "You are editing another user's media. Proceed with caution." msgid "You are editing another user's media. Proceed with caution."
msgstr "" msgstr ""
#: mediagoblin/edit/views.py:154 #: mediagoblin/edit/views.py:155
msgid "You are editing a user's profile. Proceed with caution." msgid "You are editing a user's profile. Proceed with caution."
msgstr "" msgstr ""
@ -125,15 +125,15 @@ msgstr ""
msgid "Description of this work" msgid "Description of this work"
msgstr "" msgstr ""
#: mediagoblin/submit/views.py:47 #: mediagoblin/submit/views.py:46
msgid "You must provide a file." msgid "You must provide a file."
msgstr "" msgstr ""
#: mediagoblin/submit/views.py:50 #: mediagoblin/submit/views.py:49
msgid "The file doesn't seem to be an image!" msgid "The file doesn't seem to be an image!"
msgstr "" msgstr ""
#: mediagoblin/submit/views.py:122 #: mediagoblin/submit/views.py:121
msgid "Woohoo! Submitted!" msgid "Woohoo! Submitted!"
msgstr "" msgstr ""
@ -172,8 +172,8 @@ msgid "verify your email!"
msgstr "" msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/base.html:73
#: mediagoblin/templates/mediagoblin/auth/login.html:26 #: mediagoblin/templates/mediagoblin/auth/login.html:27
#: mediagoblin/templates/mediagoblin/auth/login.html:34 #: mediagoblin/templates/mediagoblin/auth/login.html:35
msgid "Log in" msgid "Log in"
msgstr "" msgstr ""
@ -245,11 +245,11 @@ msgstr ""
msgid "Most recent media" msgid "Most recent media"
msgstr "" msgstr ""
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:29
msgid "Enter your new password" msgid "Enter your new password"
msgstr "" msgstr ""
#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27 #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:29
msgid "Enter your username or email" msgid "Enter your username or email"
msgstr "" msgstr ""
@ -275,23 +275,23 @@ msgid ""
"a happy goblin!" "a happy goblin!"
msgstr "" msgstr ""
#: mediagoblin/templates/mediagoblin/auth/login.html:29 #: mediagoblin/templates/mediagoblin/auth/login.html:30
msgid "Logging in failed!" msgid "Logging in failed!"
msgstr "" msgstr ""
#: mediagoblin/templates/mediagoblin/auth/login.html:42 #: mediagoblin/templates/mediagoblin/auth/login.html:43
msgid "Don't have an account yet?" msgid "Don't have an account yet?"
msgstr "" msgstr ""
#: mediagoblin/templates/mediagoblin/auth/login.html:45 #: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!" msgid "Create one here!"
msgstr "" msgstr ""
#: mediagoblin/templates/mediagoblin/auth/login.html:48 #: mediagoblin/templates/mediagoblin/auth/login.html:49
msgid "Forgot your password?" msgid "Forgot your password?"
msgstr "" msgstr ""
#: mediagoblin/templates/mediagoblin/auth/login.html:51 #: mediagoblin/templates/mediagoblin/auth/login.html:52
msgid "Change it!" msgid "Change it!"
msgstr "" msgstr ""
@ -299,7 +299,7 @@ msgstr ""
msgid "Create an account!" msgid "Create an account!"
msgstr "" msgstr ""
#: mediagoblin/templates/mediagoblin/auth/register.html:30 #: mediagoblin/templates/mediagoblin/auth/register.html:31
msgid "Create" msgid "Create"
msgstr "" msgstr ""
@ -342,7 +342,7 @@ msgstr ""
msgid "Submit yer media" msgid "Submit yer media"
msgstr "" msgstr ""
#: mediagoblin/templates/mediagoblin/submit/start.html:29 #: mediagoblin/templates/mediagoblin/submit/start.html:30
msgid "Submit" msgid "Submit"
msgstr "" msgstr ""
@ -480,7 +480,7 @@ msgstr ""
msgid "I am sure I want to delete this" msgid "I am sure I want to delete this"
msgstr "" msgstr ""
#: mediagoblin/user_pages/views.py:175 #: mediagoblin/user_pages/views.py:176
msgid "You are about to delete another user's media. Proceed with caution." msgid "You are about to delete another user's media. Proceed with caution."
msgstr "" msgstr ""

25
mediagoblin/templates/mediagoblin/user_pages/media.html
View File

@ -65,17 +65,7 @@
<br /> <br />
<h3>{% trans %}Comments{% endtrans %}</h3> <h3>{% trans %}Comments{% endtrans %}</h3>
{% if request.user %} <p>{% trans %}<a href="#comment_form">Post a comment</a>{% endtrans %}</p>
<form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment',
user= media.uploader().username,
media=media._id) }}" method="POST">
{{ wtforms_util.render_divs(comment_form) }}
<div class="form_submit_buttons">
<input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button" />
{{ csrf_token }}
</div>
</form>
{% endif %}
{% if comments %} {% if comments %}
{% for comment in comments %} {% for comment in comments %}
@ -108,6 +98,19 @@
</div> </div>
{% endfor %} {% endfor %}
{% if request.user %}
<a name="comment_form"></a>
<form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment',
user= media.uploader().username,
media=media._id) }}" method="POST">
{{ wtforms_util.render_divs(comment_form) }}
<div class="form_submit_buttons">
<input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button" />
{{ csrf_token }}
</div>
</form>
{% endif %}
{{ render_pagination(request, pagination, {{ render_pagination(request, pagination,
request.urlgen('mediagoblin.user_pages.media_home', request.urlgen('mediagoblin.user_pages.media_home',
user = media.uploader().username, user = media.uploader().username,