Skip to content
Browse files

translation fixes, fixed #105

  • Loading branch information...
1 parent 96c8f0f commit 4b6eb3b6dacaa2d0ea4553e5cce221f2661392a6 @sehmaschine committed Sep 6, 2012
View
2 filebrowser/actions.py
@@ -4,7 +4,7 @@
from tempfile import NamedTemporaryFile
# DJANGO IMPORTS
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
from django.contrib import messages
from django.http import HttpResponseRedirect
from django.core.files import File
View
2 filebrowser/forms.py
@@ -6,7 +6,7 @@
# DJANGO IMPORTS
from django import forms
from django.forms.formsets import BaseFormSet
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
# FILEBROWSER IMPORTS
from filebrowser.settings import MAX_UPLOAD_SIZE, FOLDER_REGEX
View
135 filebrowser/locale/en/LC_MESSAGES/django.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: django-filebrowser\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-06 15:00+0200\n"
+"POT-Creation-Date: 2012-09-06 14:17+0200\n"
"PO-Revision-Date: 2011-06-01 15:23+0000\n"
"Last-Translator: sehmaschine <patrick@vonautomatisch.at>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: actions.py:51
@@ -87,71 +87,71 @@ msgstr ""
msgid "The File already exists."
msgstr "The File already exists."
-#: settings.py:111 templates/filebrowser/include/tableheader.html:21
+#: settings.py:123 templates/filebrowser/include/tableheader.html:21
#: templates/filebrowser/include/tableheader.html:22
msgid "Folder"
msgstr "Folder"
-#: settings.py:112
+#: settings.py:124
msgid "Image"
msgstr "Image"
-#: settings.py:113
+#: settings.py:125
msgid "Video"
msgstr "Video"
-#: settings.py:114
+#: settings.py:126
msgid "Document"
msgstr "Document"
-#: settings.py:115
+#: settings.py:127
msgid "Audio"
msgstr "Audio"
-#: sites.py:269 templates/filebrowser/include/breadcrumbs.html:8
+#: sites.py:264 templates/filebrowser/include/breadcrumbs.html:8
#: templates/filebrowser/include/breadcrumbs.html:10
msgid "FileBrowser"
msgstr "FileBrowser"
-#: sites.py:298
+#: sites.py:289
#, python-format
msgid "The Folder %s was successfully created."
msgstr "The Folder %s was successfully created."
-#: sites.py:303
+#: sites.py:294
msgid "Permission denied."
msgstr "Permission denied."
-#: sites.py:305
+#: sites.py:296
msgid "Error creating folder."
msgstr "Error creating folder."
-#: sites.py:312 sites.py:315 templates/filebrowser/index.html:79
+#: sites.py:303 sites.py:306 templates/filebrowser/index.html:79
msgid "New Folder"
msgstr "New Folder"
-#: sites.py:329
+#: sites.py:320
msgid "Select files to upload"
msgstr "Select files to upload"
-#: sites.py:332 templates/filebrowser/index.html:80
+#: sites.py:323 templates/filebrowser/index.html:80
msgid "Upload"
msgstr "Upload"
-#: sites.py:363 sites.py:366
+#: sites.py:354 sites.py:357
msgid "Confirm delete"
msgstr "Confirm delete"
-#: sites.py:388
+#: sites.py:375
#, python-format
msgid "Successfully deleted %s"
msgstr "Successfully deleted %s"
-#: sites.py:433
+#: sites.py:413
msgid "Renaming was successful."
msgstr "Renaming was successful."
-#: sites.py:442
+#: sites.py:422
msgid "Error."
msgstr "Error."
@@ -168,22 +168,28 @@ msgstr "Change"
msgid "Clear"
msgstr "Clear"
-#: templates/filebrowser/createdir.html:24
-#: templates/filebrowser/detail.html:48 templates/filebrowser/rename.html:24
+#: templates/filebrowser/createdir.html:23
+#: templates/filebrowser/detail.html:47
msgid "Please correct the following errors."
msgstr "Please correct the following errors."
-#: templates/filebrowser/createdir.html:33
-#: templates/filebrowser/upload.html:131
+#: templates/filebrowser/createdir.html:36
+#: templates/filebrowser/upload.html:146
+msgid ""
+"The Name will be normalized by converting or stripping all non-standard "
+"characters."
+msgstr ""
+
+#: templates/filebrowser/createdir.html:39
+#: templates/filebrowser/upload.html:149
msgid ""
"The Name will be converted to lowercase. Spaces will be replaced with "
"underscores."
msgstr ""
"The Name will be converted to lowercase. Spaces will be replaced with "
"underscores."
-#: templates/filebrowser/createdir.html:40
-#: templates/filebrowser/rename.html:38
+#: templates/filebrowser/createdir.html:50
msgid "Submit"
msgstr "Submit"
@@ -207,115 +213,131 @@ msgstr ""
msgid "... and %(escaped_object)s more Files."
msgstr "... and %(escaped_object)s more Files."
-#: templates/filebrowser/delete_confirm.html:48
-#: templates/filebrowser/upload.html:45
+#: templates/filebrowser/delete_confirm.html:49
+#: templates/filebrowser/upload.html:50
msgid "Cancel"
msgstr "Cancel"
-#: templates/filebrowser/delete_confirm.html:49
+#: templates/filebrowser/delete_confirm.html:50
msgid "Yes, I'm sure"
msgstr "Yes, I'm sure"
-#: templates/filebrowser/detail.html:61
+#: templates/filebrowser/detail.html:62
msgid "Edit"
msgstr "Edit"
-#: templates/filebrowser/detail.html:74
+#: templates/filebrowser/detail.html:77
msgid "Folder Information"
msgstr "Folder Information"
-#: templates/filebrowser/detail.html:76 templates/filebrowser/detail.html:105
+#: templates/filebrowser/detail.html:80 templates/filebrowser/detail.html:115
#: templates/filebrowser/include/tableheader.html:28
#: templates/filebrowser/include/tableheader.html:29
msgid "Date"
msgstr "Date"
-#: templates/filebrowser/detail.html:87
+#: templates/filebrowser/detail.html:92
msgid "File Information"
msgstr "File Information"
-#: templates/filebrowser/detail.html:89
+#: templates/filebrowser/detail.html:95
msgid "URL"
msgstr "URL"
-#: templates/filebrowser/detail.html:97
+#: templates/filebrowser/detail.html:105
msgid "Filesize"
msgstr "Filesize"
-#: templates/filebrowser/detail.html:114
+#: templates/filebrowser/detail.html:126
#: templates/filebrowser/include/tableheader.html:25
#: templates/filebrowser/include/tableheader.html:26
msgid "Size"
msgstr "Size"
-#: templates/filebrowser/detail.html:126
+#: templates/filebrowser/detail.html:139
msgid "Image Versions"
msgstr "Image Versions"
-#: templates/filebrowser/detail.html:129
+#: templates/filebrowser/detail.html:143
#: templates/filebrowser/include/tableheader.html:15
msgid "Thumbnail"
msgstr "Thumbnail"
-#: templates/filebrowser/detail.html:131
+#: templates/filebrowser/detail.html:145
#: templates/filebrowser/include/filelisting.html:100
msgid "View Image"
msgstr "View Image"
-#: templates/filebrowser/detail.html:151
+#: templates/filebrowser/detail.html:169
msgid "Delete"
msgstr "Delete"
-#: templates/filebrowser/detail.html:152
+#: templates/filebrowser/detail.html:170
msgid "Save"
msgstr "Save"
-#: templates/filebrowser/detail.html:153
+#: templates/filebrowser/detail.html:171
msgid "Save and continue editing"
msgstr "Save and continue editing"
-#: templates/filebrowser/upload.html:46
+#: templates/filebrowser/upload.html:41
+#, fuzzy
+msgid "Drop files here to upload"
+msgstr "Select files to upload"
+
+#: templates/filebrowser/upload.html:42
+#, fuzzy
+msgid "Upload a file"
+msgstr "Upload"
+
+#: templates/filebrowser/upload.html:51
#, fuzzy
msgid "Failed"
msgstr "Failed"
-#: templates/filebrowser/upload.html:60
+#: templates/filebrowser/upload.html:65
msgid "{file} has invalid extension. Only {extensions} are allowed."
msgstr ""
-#: templates/filebrowser/upload.html:61
+#: templates/filebrowser/upload.html:66
msgid "{file} is too large, maximum file size is {sizeLimit}."
msgstr ""
-#: templates/filebrowser/upload.html:62
+#: templates/filebrowser/upload.html:67
msgid "{file} is too small, minimum file size is {minSizeLimit}."
msgstr ""
-#: templates/filebrowser/upload.html:63
+#: templates/filebrowser/upload.html:68
msgid "{file} is empty, please select files again without it."
msgstr ""
-#: templates/filebrowser/upload.html:64
+#: templates/filebrowser/upload.html:69
msgid ""
"The files are being uploaded, if you leave now the upload will be cancelled."
msgstr ""
-#: templates/filebrowser/upload.html:110
+#: templates/filebrowser/upload.html:114
msgid "Please enable Javascript to upload files."
msgstr ""
-#: templates/filebrowser/upload.html:115
+#: templates/filebrowser/upload.html:119
msgid "Help"
msgstr "Help"
-#: templates/filebrowser/upload.html:119
+#: templates/filebrowser/upload.html:122
msgid "Allowed"
msgstr "Allowed"
-#: templates/filebrowser/upload.html:125
+#: templates/filebrowser/upload.html:136
msgid "Max. Filesize"
msgstr "Max. Filesize"
+#: templates/filebrowser/upload.html:143
+#: templates/filebrowser/include/tableheader.html:17
+#: templates/filebrowser/include/tableheader.html:18
+msgid "Filename"
+msgstr "Filename"
+
#: templates/filebrowser/include/breadcrumbs.html:5
msgid "Home"
msgstr "Home"
@@ -368,16 +390,16 @@ msgstr "By Type"
msgid "All"
msgstr "All"
-#: templates/filebrowser/include/paginator.html:5
+#: templates/filebrowser/include/paginator.html:6
msgid "result"
msgstr "result"
-#: templates/filebrowser/include/paginator.html:5
+#: templates/filebrowser/include/paginator.html:6
msgid "results"
msgstr "results"
-#: templates/filebrowser/include/paginator.html:9
-#: templates/filebrowser/include/paginator.html:11
+#: templates/filebrowser/include/paginator.html:10
+#: templates/filebrowser/include/paginator.html:12
msgid "total"
msgstr "total"
@@ -386,11 +408,6 @@ msgstr "total"
msgid "Type"
msgstr "Type"
-#: templates/filebrowser/include/tableheader.html:17
-#: templates/filebrowser/include/tableheader.html:18
-msgid "Filename"
-msgstr "Filename"
-
#: templates/filebrowser/include/toolbar.html:6
msgid "Results"
msgstr "Results"
View
6 filebrowser/templates/filebrowser/upload.html
@@ -37,6 +37,12 @@
element: $('#file-uploader').get(0),
action: '{% url filebrowser:fb_do_upload %}',
+ template: '<div class="qq-uploader">' +
+ '<div class="qq-upload-drop-area"><span>{% trans "Drop files here to upload" %}</span></div>' +
+ '<div class="qq-upload-button">{% trans "Upload a file" %}</div>' +
+ '<ul class="qq-upload-list"></ul>' +
+ '</div>',
+
fileTemplate: '<li>' +
'<span class="qq-upload-file"></span>' +
'<span class="qq-upload-spinner"></span>' +

0 comments on commit 4b6eb3b

Please sign in to comment.
Something went wrong with that request. Please try again.