summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2016-08-30 05:07:50 -0700
committerUnknwon <u@gogs.io>2016-08-30 05:23:59 -0700
commit643142acab44d46aa6c001c90ad5d307a8662b99 (patch)
tree8e26f8959af5175e865d71a35df5dc087ff14dc8 /conf
parent7c31f235da287b0ba1499986758332c2c346deb0 (diff)
downloadgitea-643142acab44d46aa6c001c90ad5d307a8662b99.tar.gz
gitea-643142acab44d46aa6c001c90ad5d307a8662b99.zip
Web editor: support upload files
Diffstat (limited to 'conf')
-rw-r--r--conf/app.ini8
-rw-r--r--conf/locale/locale_en-US.ini8
2 files changed, 8 insertions, 8 deletions
diff --git a/conf/app.ini b/conf/app.ini
index 5206d4c3be..3287775491 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -38,10 +38,10 @@ ENABLED = true
TEMP_PATH = data/tmp/uploads
; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any file type
ALLOWED_TYPES =
-; Max size of each file in MB. Defaults to 32MB
-FILE_MAX_SIZE = 32
-; Max number of files per upload. Defaults to 10
-MAX_FILES = 10
+; Max size of each file in MB. Defaults to 3MB
+FILE_MAX_SIZE = 3
+; Max number of files per upload. Defaults to 5
+MAX_FILES = 5
[ui]
; Number of repositories that are showed in one explore page
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 2aa2bf0d60..d2ffde68c5 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -427,6 +427,7 @@ file_permalink = Permalink
file_too_large = This file is too large to be shown
editor.new_file = New file
+editor.upload_file = Upload file
editor.edit_file = Edit file
editor.preview_changes = Preview Changes
editor.cannot_edit_non_text_files = Cannot edit non-text files
@@ -459,10 +460,9 @@ editor.file_changed_while_editing = File content has been changed since you star
editor.file_already_exists = A file with name '%s' already exists in this repository.
editor.no_changes_to_show = There are no changes to show.
editor.fail_to_update_file = Failed to update/create file '%s' with error: %v
-upload_files = Upload files
-upload_file = Upload file
-add_files_to_dir = Add files to %s
-add_subdir = Add subdirectory...
+editor.add_subdir = Add subdirectory...
+editor.unable_to_upload_files = Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir = Upload files to '%s'
commits.commits = Commits
commits.search = Search commits