Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #167 from kevinansfield/missing-i18n-image-uploading 

Replace plain text in composer template
This commit is contained in:
Sam 2013-02-18 14:25:33 -08:00
parent 30a8a13484 1a81c90076
commit 82132ab48b
2 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/composer.js.handlebars
View File

@ -54,7 +54,7 @@
{{#if view.loadingImage}} {{#if view.loadingImage}}
<div id="image-uploading"> <div id="image-uploading">
Uploading image {{view.uploadProgress}}% <a {{action cancelUpload target="view"}}>cancel</a> {{i18n image_selector.uploading_image}} {{view.uploadProgress}}% <a {{action cancelUpload target="view"}}>{{i18n cancel}}</a>
</div> </div>
{{/if}} {{/if}}
</div> </div>

1
config/locales/client.en.yml
View File

@ -292,6 +292,7 @@ en:
remote_tip: "enter address of an image in the form http://example.com/image.jpg" remote_tip: "enter address of an image in the form http://example.com/image.jpg"
local_tip: "click to select an image from your device." local_tip: "click to select an image from your device."
upload: "Upload" upload: "Upload"
uploading_image: "Uploading image"
search: search:
title: "search for topics, posts, users, or categories" title: "search for topics, posts, users, or categories"