Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

English locale resource updated.

  • Loading branch information...
commit 9610480f144bc6e82544b339b7905c3b970a921a 1 parent d1055e5
@vam vam authored
Showing with 114 additions and 87 deletions.
  1. +25 −25 docs/sites.rst
  2. +89 −62 filebrowser/locale/en/LC_MESSAGES/django.po
View
50 docs/sites.rst
@@ -12,7 +12,8 @@ FileBrowser Sites
As of version 3.4, the FileBrowser application is respresented by an object of ``filebrowser.sites.FileBrowserSite`` (in analogy to Django's admin site). FileBrowser sites allow you to:
- - associate custom actions (analogy to Django's admin actions) to a site,
+ - associate :ref:`actions` (analogy to Django's admin actions) to a site,
+ - define a *custom file storage* for a site (allows for browsing remote file servers)
- subclass from FileBrowserSite and redefine the default FileBrowser's behavior,
- and to use multiple FileBrowser sites in your project.
@@ -23,46 +24,45 @@ Backward Incompatibilites
The only thing that you need to pay attention to when migrating to FileBrowser 3.4, is the specification of your URL-patterns. URL-patterns are now associated with a FileBrowser site, that is, each FileBrowser site can have different URL-patterns. See :ref:`quickstart` for how to setup your URL-patterns.
+.. Mutliple FileBrowser Sites
+.. --------------------------
-Mutliple FileBrowser Sites
---------------------------
-
-.. important::
+.. .. important::
- In majority of cases, there's no need for seting up multiple instances of FileBrowser sites. It is a supported, but not very standard way of using FileBrowser. However, there might be a few good reasons to use multiple |sites|. For example, you want to allow users to upload/delete/modify files at a location outside MEDIA_ROOT or you have implemented some custom actions that should be accessible only to certain users. In these cases, having multiple |sites| can do the job.
+.. In majority of cases, there's no need for seting up multiple instances of FileBrowser sites. It is a supported, but not very standard way of using FileBrowser. However, there might be a few good reasons to use multiple |sites|. For example, you want to allow users to upload/delete/modify files at a location outside MEDIA_ROOT or you have implemented some custom actions that should be accessible only to certain users. In these cases, having multiple |sites| can do the job.
-Before you start including additional FileBrowser sites to your project, note that there will be always a **single** FileBrowser site associated with FileBrowseFields. This site, called the **main site**, is invoked, when a user clicks on the search button of a FieldBrowseField. If you use multiple |sites|, then the main site is the one with the instance namespace "filebrowser" (or the last deployed instance, if there is no instance named "filebrowser").
+.. Before you start including additional FileBrowser sites to your project, note that there will be always a **single** FileBrowser site associated with FileBrowseFields. This site, called the **main site**, is invoked, when a user clicks on the search button of a FieldBrowseField. If you use multiple |sites|, then the main site is the one with the instance namespace "filebrowser" (or the last deployed instance, if there is no instance named "filebrowser").
-When creating a site, you can specify its instance namespace like this::
+.. When creating a site, you can specify its instance namespace like this::
- fb_site = FileBrowserSite(name="fb-site")
+.. fb_site = FileBrowserSite(name="fb-site")
-The default |site| ``filebrowser.sites.site`` has the instance name "filebrowser" and will be therefore the main site if you use it.
+.. The default |site| ``filebrowser.sites.site`` has the instance name "filebrowser" and will be therefore the main site if you use it.
-The Main Site
-^^^^^^^^^^^^^
+.. The Main Site
+.. ^^^^^^^^^^^^^
-Although it is possible to define MEDIA_ROOT and MEDIA_URL on per-site basis, the main site *must* have these variables equal to the global, default values given in ``settings.py``. See :ref:`settings` for the details about MEDIA_ROOT and MEDIA_URL.
+.. Although it is possible to define MEDIA_ROOT and MEDIA_URL on per-site basis, the main site *must* have these variables equal to the global, default values given in ``settings.py``. See :ref:`settings` for the details about MEDIA_ROOT and MEDIA_URL.
-Additional Sites
-^^^^^^^^^^^^^^^^
+.. Additional Sites
+.. ^^^^^^^^^^^^^^^^
-Any site, that is not the main site can have its MEDIA_ROOT and MEDIA_URL set to a whatever value you wish. In order to deploy an additional |site|, create the instance and give it a unique name::
+.. Any site, that is not the main site can have its MEDIA_ROOT and MEDIA_URL set to a whatever value you wish. In order to deploy an additional |site|, create the instance and give it a unique name::
- fb_site = FileBrowserSite(name="fb-site")
+.. fb_site = FileBrowserSite(name="fb-site")
-set its MEDIA_ROOT and MEDIA_URL::
+.. set its MEDIA_ROOT and MEDIA_URL::
- fb_site.media_root = '/usr/var/www/some-project/ohter-media/'
- fb_site.media_url = 'other-media/'
+.. fb_site.media_root = '/usr/var/www/some-project/ohter-media/'
+.. fb_site.media_url = 'other-media/'
-and register the site's URLs in your ``url.py``::
+.. and register the site's URLs in your ``url.py``::
- from some_project import fb_site
+.. from some_project import fb_site
- urlpatterns = patterns('',
- (r'^admin/filebrowser-other-media/', include(fb_site.urls)),
- )
+.. urlpatterns = patterns('',
+.. (r'^admin/filebrowser-other-media/', include(fb_site.urls)),
+.. )
View
151 filebrowser/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-filebrowser\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-16 16:27+0200\n"
+"POT-Creation-Date: 2011-10-06 15:00+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"
@@ -16,153 +16,155 @@ msgstr ""
"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: actions.py:34
+#: actions.py:51
#, python-format
msgid "Action applied successfully to '%s'"
msgstr ""
-#: actions.py:39 forms.py:20
+#: actions.py:56 forms.py:21
msgid "Flip horizontal"
msgstr ""
-#: actions.py:44 forms.py:21
+#: actions.py:62 forms.py:22
msgid "Flip vertical"
msgstr ""
-#: actions.py:49 forms.py:22
+#: actions.py:68 forms.py:23
msgid "Rotate 90° CW"
msgstr ""
-#: actions.py:54 forms.py:23
+#: actions.py:74 forms.py:24
msgid "Rotate 90° CCW"
msgstr ""
-#: actions.py:59 forms.py:24
+#: actions.py:80 forms.py:25
msgid "Rotate 180°"
msgstr ""
-#: decorators.py:48
+#: decorators.py:23
#, fuzzy
-msgid "Error finding Upload-Folder. Maybe it does not exist?"
+msgid ""
+"Error finding Upload-Folder (MEDIA_ROOT + DIRECTORY). Maybe it does not "
+"exist?"
msgstr ""
"Error finding Upload-Folder (MEDIA_ROOT + DIRECTORY). Maybe it does not "
"exist?"
-#: decorators.py:50
+#: decorators.py:25
msgid "The requested Folder does not exist."
msgstr "The requested Folder does not exist."
-#: decorators.py:66
+#: decorators.py:41
msgid "The requested File does not exist."
msgstr "The requested File does not exist."
-#: decorators.py:72
+#: decorators.py:47
msgid "You do not have permission to access this file!"
msgstr ""
-#: fields.py:63
+#: fields.py:65
#, python-format
msgid "Extension %(ext)s is not allowed. Only %(allowed)s is allowed."
msgstr "Extension %(ext)s is not allowed. Only %(allowed)s is allowed."
-#: forms.py:37 forms.py:55
+#: forms.py:39 forms.py:58
msgid "Name"
msgstr "Name"
-#: forms.py:37 forms.py:43 forms.py:55 forms.py:76
+#: forms.py:39 forms.py:45 forms.py:58 forms.py:79
msgid "Only letters, numbers, underscores, spaces and hyphens are allowed."
msgstr "Only letters, numbers, underscores, spaces and hyphens are allowed."
-#: forms.py:46 forms.py:79
+#: forms.py:48 forms.py:82
msgid "The Folder already exists."
msgstr "The Folder already exists."
-#: forms.py:54
+#: forms.py:57
msgid "Actions"
msgstr ""
-#: forms.py:81
+#: forms.py:84
msgid "The File already exists."
msgstr "The File already exists."
-#: settings.py:108 templates/filebrowser/include/tableheader.html:21
+#: settings.py:111 templates/filebrowser/include/tableheader.html:21
#: templates/filebrowser/include/tableheader.html:22
msgid "Folder"
msgstr "Folder"
-#: settings.py:109
+#: settings.py:112
msgid "Image"
msgstr "Image"
-#: settings.py:110
+#: settings.py:113
msgid "Video"
msgstr "Video"
-#: settings.py:111
+#: settings.py:114
msgid "Document"
msgstr "Document"
-#: settings.py:112
+#: settings.py:115
msgid "Audio"
msgstr "Audio"
-#: sites.py:200 templates/filebrowser/include/breadcrumbs.html:8
+#: sites.py:269 templates/filebrowser/include/breadcrumbs.html:8
#: templates/filebrowser/include/breadcrumbs.html:10
msgid "FileBrowser"
msgstr "FileBrowser"
-#: sites.py:229
+#: sites.py:298
#, python-format
msgid "The Folder %s was successfully created."
msgstr "The Folder %s was successfully created."
-#: sites.py:234
+#: sites.py:303
msgid "Permission denied."
msgstr "Permission denied."
-#: sites.py:236
+#: sites.py:305
msgid "Error creating folder."
msgstr "Error creating folder."
-#: sites.py:243 sites.py:246 templates/filebrowser/index.html:79
+#: sites.py:312 sites.py:315 templates/filebrowser/index.html:79
msgid "New Folder"
msgstr "New Folder"
-#: sites.py:268
+#: sites.py:329
msgid "Select files to upload"
msgstr "Select files to upload"
-#: sites.py:271 templates/filebrowser/index.html:80
-#: templates/filebrowser/upload.html:124
+#: sites.py:332 templates/filebrowser/index.html:80
msgid "Upload"
msgstr "Upload"
-#: sites.py:304 sites.py:307
+#: sites.py:363 sites.py:366
msgid "Confirm delete"
msgstr "Confirm delete"
-#: sites.py:331
+#: sites.py:388
#, python-format
msgid "Successfully deleted %s"
msgstr "Successfully deleted %s"
-#: sites.py:376
+#: sites.py:433
msgid "Renaming was successful."
msgstr "Renaming was successful."
-#: sites.py:385
+#: sites.py:442
msgid "Error."
msgstr "Error."
-#: widgets.py:21
+#: widgets.py:19 widgets.py:52
msgid "Currently"
msgstr "Currently"
-#: widgets.py:22 templates/filebrowser/include/filelisting.html:130
+#: widgets.py:20 widgets.py:53
+#: templates/filebrowser/include/filelisting.html:130
msgid "Change"
msgstr "Change"
-#: widgets.py:23
+#: widgets.py:21 widgets.py:54
msgid "Clear"
msgstr "Clear"
@@ -172,7 +174,7 @@ msgid "Please correct the following errors."
msgstr "Please correct the following errors."
#: templates/filebrowser/createdir.html:33
-#: templates/filebrowser/upload.html:116
+#: templates/filebrowser/upload.html:131
msgid ""
"The Name will be converted to lowercase. Spaces will be replaced with "
"underscores."
@@ -185,8 +187,9 @@ msgstr ""
msgid "Submit"
msgstr "Submit"
-#: templates/filebrowser/custom_field.html:17
+#: templates/filebrowser/custom_field.html:26
#: templates/filebrowser/widgets/clearablefileinput.html:11
+#: templates/filebrowser/widgets/fileinput.html:11
msgid "File not found"
msgstr "File not found"
@@ -205,6 +208,7 @@ 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
msgid "Cancel"
msgstr "Cancel"
@@ -270,46 +274,48 @@ msgstr "Save"
msgid "Save and continue editing"
msgstr "Save and continue editing"
+#: templates/filebrowser/upload.html:46
+#, fuzzy
+msgid "Failed"
+msgstr "Filter"
+
+#: templates/filebrowser/upload.html:60
+msgid "{file} has invalid extension. Only {extensions} are allowed."
+msgstr ""
+
#: templates/filebrowser/upload.html:61
-msgid "BROWSE"
-msgstr "BROWSE"
+msgid "{file} is too large, maximum file size is {sizeLimit}."
+msgstr ""
#: templates/filebrowser/upload.html:62
-msgid "An Error occured"
-msgstr "An Error occured"
+msgid "{file} is too small, minimum file size is {minSizeLimit}."
+msgstr ""
#: templates/filebrowser/upload.html:63
-msgid "Completed"
-msgstr "Completed"
+msgid "{file} is empty, please select files again without it."
+msgstr ""
#: templates/filebrowser/upload.html:64
-msgid "Do you want to replace the file"
-msgstr "Do you want to replace the file"
-
-#: templates/filebrowser/upload.html:65
-msgid "KB"
-msgstr "KB"
+msgid ""
+"The files are being uploaded, if you leave now the upload will be cancelled."
+msgstr ""
-#: templates/filebrowser/upload.html:66
-msgid "MB"
-msgstr "MB"
+#: templates/filebrowser/upload.html:110
+msgid "Please enable Javascript to upload files."
+msgstr ""
-#: templates/filebrowser/upload.html:100
+#: templates/filebrowser/upload.html:115
msgid "Help"
msgstr "Help"
-#: templates/filebrowser/upload.html:104
+#: templates/filebrowser/upload.html:119
msgid "Allowed"
msgstr "Allowed"
-#: templates/filebrowser/upload.html:110
+#: templates/filebrowser/upload.html:125
msgid "Max. Filesize"
msgstr "Max. Filesize"
-#: templates/filebrowser/upload.html:123
-msgid "Clear Queue"
-msgstr "Clear Queue"
-
#: templates/filebrowser/include/breadcrumbs.html:5
msgid "Home"
msgstr "Home"
@@ -405,6 +411,27 @@ msgstr "%(full_result_count)s total"
msgid "Search"
msgstr "Search"
+#~ msgid "BROWSE"
+#~ msgstr "BROWSE"
+
+#~ msgid "An Error occured"
+#~ msgstr "An Error occured"
+
+#~ msgid "Completed"
+#~ msgstr "Completed"
+
+#~ msgid "Do you want to replace the file"
+#~ msgstr "Do you want to replace the file"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "MB"
+#~ msgstr "MB"
+
+#~ msgid "Clear Queue"
+#~ msgstr "Clear Queue"
+
#~ msgid "Flip/Rotate"
#~ msgstr "Flip/Rotate"
Please sign in to comment.
Something went wrong with that request. Please try again.