From 8c7ded3062d86715ea473556ca6730f6a626c382 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 14 Apr 2015 15:31:17 -0400 Subject: [PATCH] closes #3026 --- public/language/en_GB/error.json | 2 +- public/language/en_GB/uploads.json | 3 ++- public/language/en_GB/user.json | 1 - public/src/modules/uploader.js | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index 11f507b168..a0229918f5 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -58,7 +58,7 @@ "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", - "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", + "file-too-big": "Maximum allowed file size is %1 kb - please upload a smaller file", "cant-vote-self-post": "You cannot vote for your own post", "already-favourited": "You have already favourited this post", diff --git a/public/language/en_GB/uploads.json b/public/language/en_GB/uploads.json index 5dc53ede1f..8cf9487901 100644 --- a/public/language/en_GB/uploads.json +++ b/public/language/en_GB/uploads.json @@ -1,5 +1,6 @@ { "uploading-file" : "Uploading the file...", "select-file-to-upload": "Select a file to upload!", - "upload-success": "File uploaded successfully!" + "upload-success": "File uploaded successfully!", + "maximum-file-size": "Maximum %1 kb" } \ No newline at end of file diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json index 730feaabac..d35b8621f5 100644 --- a/public/language/en_GB/user.json +++ b/public/language/en_GB/user.json @@ -52,7 +52,6 @@ "upload_picture": "Upload picture", "upload_a_picture": "Upload a picture", "image_spec": "You may only upload PNG, JPG, or GIF files", - "max": "max.", "settings": "Settings", "show_email": "Show My Email", diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js index 6efdbd988c..63fa21cbce 100644 --- a/public/src/modules/uploader.js +++ b/public/src/modules/uploader.js @@ -16,8 +16,9 @@ define('uploader', ['csrf'], function(csrf) { uploadForm.find('#params').val(JSON.stringify(params)); if (fileSize) { - uploadForm.find('#upload-file-size').html(fileSize); - uploadForm.find('#file-size-block').removeClass('hide'); + uploadForm.find('#file-size-block') + .translateText('[[uploads:maximum-file-size, ' + fileSize + ']]') + .removeClass('hide'); } else { uploadForm.find('#file-size-block').addClass('hide'); }