From 36e6345eee7b1f7f3a4103d3f8c724b87425b370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Sun, 14 Jul 2013 23:44:50 +0200 Subject: [PATCH] change the icon in the composer toolbar with a more generic upload icon also changed all references to "images uploads" to a "uploads" --- .../discourse/components/markdown.js | 6 ++-- .../controllers/image_selector_controller.js | 22 ------------ .../controllers/upload_selector_controller.js | 17 +++++++++ .../discourse/routes/application_route.js | 11 +++--- .../templates/composer.js.handlebars | 2 +- .../templates/image_selector.js.handlebars | 36 ------------------- .../modal/image_selector.js.handlebars | 36 ------------------- .../modal/upload_selector.js.handlebars | 36 +++++++++++++++++++ .../discourse/views/composer_view.js | 2 +- .../views/modal/image_selector_view.js | 23 ------------ .../views/modal/upload_selector_view.js | 23 ++++++++++++ .../stylesheets/application/pagedown.css.scss | 12 +++---- .../{image-upload.scss => upload.scss} | 7 ++-- config/locales/client.cs.yml | 10 +++--- config/locales/client.da.yml | 10 +++--- config/locales/client.de.yml | 10 +++--- config/locales/client.en.yml | 22 ++++++------ config/locales/client.es.yml | 10 +++--- config/locales/client.fr.yml | 22 ++++++------ config/locales/client.id.yml | 4 +-- config/locales/client.it.yml | 10 +++--- config/locales/client.nb_NO.yml | 10 +++--- config/locales/client.nl.yml | 10 +++--- config/locales/client.pseudo.yml | 10 +++--- config/locales/client.pt.yml | 4 +-- config/locales/client.ru.yml | 10 +++--- config/locales/client.sv.yml | 10 +++--- config/locales/client.zh_CN.yml | 10 +++--- config/locales/client.zh_TW.yml | 10 +++--- 29 files changed, 178 insertions(+), 227 deletions(-) delete mode 100644 app/assets/javascripts/discourse/controllers/image_selector_controller.js create mode 100644 app/assets/javascripts/discourse/controllers/upload_selector_controller.js delete mode 100644 app/assets/javascripts/discourse/templates/image_selector.js.handlebars delete mode 100644 app/assets/javascripts/discourse/templates/modal/image_selector.js.handlebars create mode 100644 app/assets/javascripts/discourse/templates/modal/upload_selector.js.handlebars delete mode 100644 app/assets/javascripts/discourse/views/modal/image_selector_view.js create mode 100644 app/assets/javascripts/discourse/views/modal/upload_selector_view.js rename app/assets/stylesheets/application/{image-upload.scss => upload.scss} (75%) diff --git a/app/assets/javascripts/discourse/components/markdown.js b/app/assets/javascripts/discourse/components/markdown.js index 1f1e227fdee..76bce725583 100644 --- a/app/assets/javascripts/discourse/components/markdown.js +++ b/app/assets/javascripts/discourse/components/markdown.js @@ -62,10 +62,8 @@ Discourse.Markdown = { code: I18n.t("composer.code_title") + " 
 Ctrl+K",
         codeexample: I18n.t("composer.code_text"),
 
-        image: I18n.t("composer.image_title") + "  Ctrl+G",
-        imagedescription: I18n.t("composer.image_description"),
-        imagedialog: "
" + I18n.t("composer.image_dialog_title") + "
http://example.com/images/diagram.jpg \"" +
-            I18n.t("composer.image_optional_text") + "\"

" + I18n.t("composer.image_hosting_hint") + "
",
+        image: I18n.t("composer.upload_title") + " - Ctrl+G",
+        imagedescription: I18n.t("composer.upload_description"),
 
         olist: I18n.t("composer.olist_title") + " 
     Ctrl+O",
         ulist: I18n.t("composer.ulist_title") + " 
       Ctrl+U",
diff --git a/app/assets/javascripts/discourse/controllers/image_selector_controller.js b/app/assets/javascripts/discourse/controllers/image_selector_controller.js
deleted file mode 100644
index b169bd612a6..00000000000
--- a/app/assets/javascripts/discourse/controllers/image_selector_controller.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
-  The modal for inviting a user to a topic
-
-  @class ImageSelectorController
-  @extends Discourse.Controller
-  @namespace Discourse
-  @uses Discourse.ModalFunctionality
-  @module Discourse
-**/
-Discourse.ImageSelectorController = Discourse.Controller.extend(Discourse.ModalFunctionality, {
-
-  selectLocal: function() {
-    this.set('localSelected', true);
-  },
-
-  selectRemote: function() {
-    this.set('localSelected', false);
-  },
-
-  remoteSelected: Em.computed.not('localSelected')
-
-});
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/controllers/upload_selector_controller.js b/app/assets/javascripts/discourse/controllers/upload_selector_controller.js
new file mode 100644
index 00000000000..6300983dafa
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/upload_selector_controller.js
@@ -0,0 +1,17 @@
+/**
+  The modal for upload a file to a post
+
+  @class UploadSelectorController
+  @extends Discourse.Controller
+  @namespace Discourse
+  @uses Discourse.ModalFunctionality
+  @module Discourse
+**/
+Discourse.UploadSelectorController = Discourse.Controller.extend(Discourse.ModalFunctionality, {
+  localSelected: true,
+  remoteSelected: Em.computed.not('localSelected'),
+
+  selectLocal: function() { this.set('localSelected', true); },
+  selectRemote: function() { this.set('localSelected', false); }
+
+});
diff --git a/app/assets/javascripts/discourse/routes/application_route.js b/app/assets/javascripts/discourse/routes/application_route.js
index 76a6915671d..dd8212fe567 100644
--- a/app/assets/javascripts/discourse/routes/application_route.js
+++ b/app/assets/javascripts/discourse/routes/application_route.js
@@ -26,12 +26,9 @@ Discourse.ApplicationRoute = Em.Route.extend({
       this.controllerFor('notActivated').setProperties(props);
     },
 
-    showImageSelector: function(composerView) {
-      Discourse.Route.showModal(this, 'imageSelector');
-      this.controllerFor('imageSelector').setProperties({
-        localSelected: true,
-        composerView: composerView
-      });
+    showUploadSelector: function(composerView) {
+      Discourse.Route.showModal(this, 'uploadSelector');
+      this.controllerFor('uploadSelector').setProperties({ composerView: composerView });
     },
 
 
@@ -62,4 +59,4 @@ Discourse.ApplicationRoute = Em.Route.extend({
 
   }
 
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/discourse/templates/composer.js.handlebars b/app/assets/javascripts/discourse/templates/composer.js.handlebars
index 75c842956c2..693c8bb21af 100644
--- a/app/assets/javascripts/discourse/templates/composer.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/composer.js.handlebars
@@ -77,7 +77,7 @@
             
      
             {{#if view.isUploading}}
               
      
-                {{i18n image_selector.uploading_image}} {{view.uploadProgress}}% {{i18n cancel}}
+                {{i18n upload_selector.upload_file}} {{view.uploadProgress}}% {{i18n cancel}}
               
      
             {{/if}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/image_selector.js.handlebars b/app/assets/javascripts/discourse/templates/image_selector.js.handlebars
deleted file mode 100644
index 78e96f064de..00000000000
--- a/app/assets/javascripts/discourse/templates/image_selector.js.handlebars
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-{{#if localSelected}}
-
      
-  
      
-    
      
-    {{i18n image_selector.local_tip}} 
      
-  
      
-
      
-
      
-  
-
      
-{{else}}
-
      
-  
      
-    
      
-    {{i18n image_selector.remote_tip}} 
      
-  
      
-
      
-
      
-  
-
      
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/image_selector.js.handlebars b/app/assets/javascripts/discourse/templates/modal/image_selector.js.handlebars
deleted file mode 100644
index 78e96f064de..00000000000
--- a/app/assets/javascripts/discourse/templates/modal/image_selector.js.handlebars
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-{{#if localSelected}}
-
      
-  
      
-    
      
-    {{i18n image_selector.local_tip}} 
      
-  
      
-
      
-
      
-  
-
      
-{{else}}
-
      
-  
      
-    
      
-    {{i18n image_selector.remote_tip}} 
      
-  
      
-
      
-
      
-  
-
      
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/upload_selector.js.handlebars b/app/assets/javascripts/discourse/templates/modal/upload_selector.js.handlebars
new file mode 100644
index 00000000000..f1dfbbd0963
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/modal/upload_selector.js.handlebars
@@ -0,0 +1,36 @@
+
+
+{{#if localSelected}}
+  
      
+    
      
+      
      
+      {{i18n upload_selector.local_tip}} 
      
+    
      
+  
      
+  
      
+    
+  
      
+{{else}}
+  
      
+    
      
+      
      
+      {{i18n upload_selector.remote_tip}} 
      
+    
      
+  
      
+  
      
+    
+  
      
+{{/if}}
diff --git a/app/assets/javascripts/discourse/views/composer_view.js b/app/assets/javascripts/discourse/views/composer_view.js
index 465c8d9c92d..f0bf588f0bf 100644
--- a/app/assets/javascripts/discourse/views/composer_view.js
+++ b/app/assets/javascripts/discourse/views/composer_view.js
@@ -199,7 +199,7 @@ Discourse.ComposerView = Discourse.View.extend({
     var $uploadTarget = $('#reply-control');
     this.editor.hooks.insertImageDialog = function(callback) {
       callback(null);
-      composerView.get('controller').send('showImageSelector', composerView);
+      composerView.get('controller').send('showUploadSelector', composerView);
       return true;
     };
 
diff --git a/app/assets/javascripts/discourse/views/modal/image_selector_view.js b/app/assets/javascripts/discourse/views/modal/image_selector_view.js
deleted file mode 100644
index 31f4daa1070..00000000000
--- a/app/assets/javascripts/discourse/views/modal/image_selector_view.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
-  This view handles the image upload interface
-
-  @class ImageSelectorView
-  @extends Discourse.ModalBodyView
-  @namespace Discourse
-  @module Discourse
-**/
-Discourse.ImageSelectorView = Discourse.ModalBodyView.extend({
-  templateName: 'modal/image_selector',
-  classNames: ['image-selector'],
-  title: I18n.t('image_selector.title'),
-
-  upload: function() {
-    $('#reply-control').fileupload('add', { fileInput: $('#filename-input') });
-  },
-
-  add: function() {
-    this.get('controller.composerView').addMarkdown("![image](" + $('#fileurl-input').val() + ")");
-    this.get('controller').send('closeModal');
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/views/modal/upload_selector_view.js b/app/assets/javascripts/discourse/views/modal/upload_selector_view.js
new file mode 100644
index 00000000000..fdd3134274a
--- /dev/null
+++ b/app/assets/javascripts/discourse/views/modal/upload_selector_view.js
@@ -0,0 +1,23 @@
+/**
+  This view handles the upload interface
+
+  @class UploadSelectorView
+  @extends Discourse.ModalBodyView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.UploadSelectorView = Discourse.ModalBodyView.extend({
+  templateName: 'modal/upload_selector',
+  classNames: ['upload-selector'],
+  title: I18n.t('upload_selector.title'),
+
+  upload: function() {
+    $('#reply-control').fileupload('add', { fileInput: $('#filename-input') });
+  },
+
+  add: function() {
+    this.get('controller.composerView').addMarkdown($('#fileurl-input').val());
+    this.get('controller').send('closeModal');
+  }
+
+});
diff --git a/app/assets/stylesheets/application/pagedown.css.scss b/app/assets/stylesheets/application/pagedown.css.scss
index fc5ab0df717..2aa3941e1e6 100644
--- a/app/assets/stylesheets/application/pagedown.css.scss
+++ b/app/assets/stylesheets/application/pagedown.css.scss
@@ -69,13 +69,13 @@
 }
 
 
-#wmd-bold-button:before { 
-  content: "\f032"; 
+#wmd-bold-button:before {
+  content: "\f032";
 }
 
 
 #wmd-italic-button:before {
-  content: "\f033"; 
+  content: "\f033";
 }
 
 #wmd-link-button:before {
@@ -91,15 +91,15 @@
 }
 
 #wmd-image-button:before {
-  content: "\f03e"; 
+  content: "\f093";
 }
 
 #wmd-olist-button:before {
-  content: "\f0cb"; 
+  content: "\f0cb";
 }
 
 #wmd-ulist-button:before {
-  content: "\f0ca"; 
+  content: "\f0ca";
 }
 
 #wmd-heading-button:before {
diff --git a/app/assets/stylesheets/application/image-upload.scss b/app/assets/stylesheets/application/upload.scss
similarity index 75%
rename from app/assets/stylesheets/application/image-upload.scss
rename to app/assets/stylesheets/application/upload.scss
index 38ece6e3769..d68869493b0 100644
--- a/app/assets/stylesheets/application/image-upload.scss
+++ b/app/assets/stylesheets/application/upload.scss
@@ -1,9 +1,7 @@
-// base styles for every modal popup used in Discourse
-
 @import "foundation/variables";
 @import "foundation/mixins";
 
-.add-picture .icon-plus {
+.add-upload .icon-plus {
   font-size: 10px;
   position: relative;
   left: -5px;
@@ -14,8 +12,7 @@
     -1px 1px 0 $btn-primary-background-color;
 }
 
-// we should refactor this into something more general
-.image-selector {
+.upload-selector {
   input[type="text"]{
     width: 520px;
   }
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index ef010664531..10f813a7461 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -470,9 +470,9 @@ cs:
       quote_text: "Bloková citace"
       code_title: "Ukázka kódu"
       code_text: "sem vložte kód"
-      image_title: "Obrázek"
-      image_description: "sem vložek popis obrázku"
-      image_dialog_title: "Vložit obrázek"
+      upload_title: "Obrázek"
+      upload_description: "sem vložek popis obrázku"
+      upload_dialog_title: "Vložit obrázek"
       image_optional_text: "volitelný popis"
       image_hosting_hint: "Potřebujete hosting obrázků zdarma?"
       olist_title: "Číslovaný seznam"
@@ -506,7 +506,7 @@ cs:
       moved_post: " {{username}} přesunul příspěvek do {{link}}"
       total_flagged: "celkem nahlášeno příspěvků"
 
-    image_selector:
+    upload_selector:
       title: "Vložit obrázek"
       from_my_computer: "Z mého zařízení"
       from_the_web: "Z webu"
@@ -516,7 +516,7 @@ cs:
       local_title: "obrázek z lokálního úložiště"
       local_tip: "klikněte sem pro výběr obrázku z vašeho zařízení"
       upload: "Nahrát"
-      uploading_image: "Nahrávám obrázek"
+      upload_file: "Nahrávám obrázek"
 
     search:
       title: "hledání témat, příspěvků, uživatelů a kategorií"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 6fc9a4aaf97..eec9f4f3fe5 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -319,9 +319,9 @@ da:
       quote_text: "Citatblok"
       code_title: "Programkode"
       code_text: "skriv programkode her"
-      image_title: "Billede"
-      image_description: "skriv billedets beskrivelse her"
-      image_dialog_title: "Indsæt billede"
+      upload_title: "Billede"
+      upload_description: "skriv billedets beskrivelse her"
+      upload_dialog_title: "Indsæt billede"
       image_optional_text: "evt. titel"
       image_hosting_hint: "Brug for gratis billed hosting?"
       olist_title: "Numereret liste"
@@ -349,7 +349,7 @@ da:
       invitee_accepted: " {{username}} har accepteret din invitation"
       moved_post: " {{username}} flyttede indlæg til {{link}}"
 
-    image_selector:
+    upload_selector:
       title: "Indsæt billede"
       from_my_computer: "Fra min computer"
       from_the_web: "Fra nettet"
@@ -357,7 +357,7 @@ da:
       remote_tip: "skriv adressen på et billede i formen http://example.com/billede.jpg"
       local_tip: "klik for at vælge et billede fra din computer."
       upload: "Upload"
-      uploading_image: "Uploader billede"
+      upload_file: "Uploader billede"
 
     search:
       title: "søg efter emner, indlæg, brugere eller kategorier"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 32ca6ca00a6..4ace781c858 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -453,9 +453,9 @@ de:
       quote_text: "Zitat"
       code_title: "Code"
       code_text: "Gib hier den Code ein"
-      image_title: "Bild"
-      image_description: "Gib hier eine Bildbeschreibung ein"
-      image_dialog_title: "Bild einfügen"
+      upload_title: "Bild"
+      upload_description: "Gib hier eine Bildbeschreibung ein"
+      upload_dialog_title: "Bild einfügen"
       image_optional_text: "optionaler Titel"
       image_hosting_hint: "Benötigst Du kostenlosen Dienst für Bilder?"
       olist_title: "Nummerierte Liste"
@@ -489,7 +489,7 @@ de:
       moved_post: " {{username}} hat einen Beitrag nach {{link}} verschoben"
       total_flagged: "total markierte Einträge"
 
-    image_selector:
+    upload_selector:
       title: "Bild einfügen"
       from_my_computer: "von meinem Gerät"
       from_the_web: "aus dem Web"
@@ -499,7 +499,7 @@ de:
       local_title: "Lokales Bild"
       local_tip: "Klicke hier, um ein Bild von deinem Gerät zu wählen."
       upload: "Hochladen"
-      uploading_image: "Bild wird hochgeladen"
+      upload_file: "Bild wird hochgeladen"
 
     search:
       title: "Such nach Themen, Beiträgen, Nutzern oder Kategorien"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b294740f888..ac8839b310b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -448,9 +448,9 @@ en:
       quote_text: "Blockquote"
       code_title: "Code Sample"
       code_text: "enter code here"
-      image_title: "Image"
-      image_description: "enter image description here"
-      image_dialog_title: "Insert Image"
+      upload_title: "Image"
+      upload_description: "enter image description here"
+      upload_dialog_title: "Insert Image"
       image_optional_text: "optional title"
       image_hosting_hint: "Need free image hosting?"
       olist_title: "Numbered List"
@@ -484,17 +484,17 @@ en:
       moved_post: " {{username}} moved to {{link}}"
       total_flagged: "total flagged posts"
 
-    image_selector:
-      title: "Insert Image"
+    upload_selector:
+      title: "Upload file"
       from_my_computer: "From My Device"
       from_the_web: "From The Web"
-      add_image: "Add Image"
-      remote_title: "remote image"
-      remote_tip: "enter address of an image in the form http://example.com/image.jpg"
-      local_title: "local image"
-      local_tip: "click to select an image from your device."
+      add_image: "Add File"
+      remote_title: "remote file"
+      remote_tip: "enter address of a file in the form http://example.com/image.jpg"
+      local_title: "local file"
+      local_tip: "click to select a file from your device."
       upload: "Upload"
-      uploading_image: "Uploading image"
+      upload_file: "Uploading"
 
     search:
       title: "search for topics, posts, users, or categories"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index cf1147e9423..fdf00e497c9 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -395,9 +395,9 @@ es:
       quote_text: "Blockquote"
       code_title: "Code Sample"
       code_text: "enter code here"
-      image_title: "Image"
-      image_description: "enter image description here"
-      image_dialog_title: "Insert Image"
+      upload_title: "Image"
+      upload_description: "enter image description here"
+      upload_dialog_title: "Insert Image"
       image_optional_text: "optional title"
       image_hosting_hint: "Need free image hosting?"
       olist_title: "Numbered List"
@@ -425,7 +425,7 @@ es:
       invitee_accepted: " {{username}} aceptó tu invitación"
       moved_post: " {{username}} trasladó la publicación a {{link}}"
 
-    image_selector:
+    upload_selector:
       title: "Insertar Imagen"
       from_my_computer: "Desde Mí Dispositivo"
       from_the_web: "Desde La Web"
@@ -433,7 +433,7 @@ es:
       remote_tip: "ingrese una dirección de una imagen en la siguiente forma http://ejemplo.com/imagen.jpg"
       local_tip: "click para seleccionar la imagen desde su dispositivo."
       upload: "Subir"
-      uploading_image: "Subiendo imagen"
+      upload_file: "Subiendo imagen"
 
     search:
       title: "buscar por temas, publicaciones, usuarios o categorías"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index bebe7881fef..10603235adf 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -442,9 +442,9 @@ fr:
       quote_text: "Citation"
       code_title: "Bout de code"
       code_text: "renseignez ici votre code"
-      image_title: "Image"
-      image_description: "renseignez ici la description de l'image"
-      image_dialog_title: "Insérez l'image"
+      upload_title: "Image"
+      upload_description: "renseignez ici la description de l'image"
+      upload_dialog_title: "Insérez l'image"
       image_optional_text: "titre optionnel"
       image_hosting_hint: "Besoin d'un hébergeur d'image gratuit ?"
       olist_title: "Liste numérotée"
@@ -489,17 +489,17 @@ fr:
       moved_post: " {{username}} a déplacé le message vers {{link}}"
       total_flagged: "Nombre total de messages signalés"
 
-    image_selector:
-      title: "Insérer une image"
+    upload_selector:
+      title: "Insérer un fichier"
       from_my_computer: "Local"
       from_the_web: "Depuis internet"
-      add_image: "Ajouter une image"
-      remote_title: "Image distante"
-      remote_tip: "saisissez l'url de l'image"
-      local_title: "Image locale"
-      local_tip: "Cliquez pour sélectionner une image depuis votre ordinateur."
+      add_image: "Ajouter un fichier"
+      remote_title: "Fichier distant"
+      remote_tip: "saisissez l'url du fichier"
+      local_title: "Fichier local"
+      local_tip: "Cliquez pour sélectionner un fichier depuis votre ordinateur."
       upload: "Envoyer"
-      uploading_image: "Image en cours d'envoi"
+      upload_file: "Fichier en cours d'envoi"
 
     search:
       title: "Rechercher les discussions, messages, utilisateurs ou catégories"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index f14e3521050..e45ae59645a 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -310,7 +310,7 @@ id:
       invitee_accepted: " {{username}} accepted your invitation"
       moved_post: " {{username}} moved post to {{link}}"
 
-    image_selector:
+    upload_selector:
       title: "Insert Image"
       from_my_computer: "From My Device"
       from_the_web: "From The Web"
@@ -318,7 +318,7 @@ id:
       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."
       upload: "Upload"
-      uploading_image: "Uploading image"
+      upload_file: "Uploading image"
 
     search:
       title: "search for topics, posts, users, or categories"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index cb9d18fd87d..00fdc54d031 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -382,9 +382,9 @@ it:
       quote_text: "Blockquote"
       code_title: "Esempio di codice"
       code_text: "inserisci il codice qui"
-      image_title: "Immagine"
-      image_description: "descrizione dell'immagine"
-      image_dialog_title: "Inserisci Immagine"
+      upload_title: "Immagine"
+      upload_description: "descrizione dell'immagine"
+      upload_dialog_title: "Inserisci Immagine"
       image_optional_text: "titolo facoltativo"
       image_hosting_hint: "Hai bisogno di free image hosting?"
       olist_title: "Lista Numerata"
@@ -418,7 +418,7 @@ it:
       moved_post: " {{username}} ha spostato il post qui {{link}}"
       total_flagged: "totale post segnalati"
 
-    image_selector:
+    upload_selector:
       title: "Inserisci Immagine"
       from_my_computer: "Dal mio dispositivo"
       from_the_web: "Dal Web"
@@ -428,7 +428,7 @@ it:
       local_title: "immagine locale"
       local_tip: "clicca per selezionare un'immagine dal tuo dispositivo."
       upload: "Upload"
-      uploading_image: "Carico l'immagine"
+      upload_file: "Carico l'immagine"
 
     search:
       title: "cerca topic, post, utenti o categorie"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 193c48e3896..381fde4b550 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -393,9 +393,9 @@ nb_NO:
       quote_text: "Sitatramme"
       code_title: "Kode Utsnitt"
       code_text: "Legg inn kode her"
-      image_title: "Bilde"
-      image_description: "beskriv bildet her"
-      image_dialog_title: "Legg til Bildet"
+      upload_title: "Bilde"
+      upload_description: "beskriv bildet her"
+      upload_dialog_title: "Legg til Bildet"
       image_optional_text: "valgfri title"
       image_hosting_hint: "Trenger du gratis bildelagring?"
       olist_title: "Nummerert Liste"
@@ -429,7 +429,7 @@ nb_NO:
       moved_post: " {{username}} flyttet til {{link}}"
       total_flagged: "totalt markerte innlegg"
 
-    image_selector:
+    upload_selector:
       title: "Legg til Bilde"
       from_my_computer: "Fra Min Enhet"
       from_the_web: "Fra Nettet"
@@ -439,7 +439,7 @@ nb_NO:
       local_title: "lokalt bilde"
       local_tip: "klikk for å velge et bilde fra din enhet."
       upload: "Last opp"
-      uploading_image: "Laster opp bilde"
+      upload_file: "Laster opp bilde"
 
     search:
       title: "søk etter emner, innlegg, brukere eller kategorier"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 574a9f64b0a..f24f16eb0e1 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -453,9 +453,9 @@ nl:
       quote_text: Citaat
       code_title: Code voorbeeld
       code_text: hier de code
-      image_title: Afbeelding
-      image_description: geef een omschrijving voor de afbeelding op
-      image_dialog_title: Voeg afbeelding toe
+      upload_title: Afbeelding
+      upload_description: geef een omschrijving voor de afbeelding op
+      upload_dialog_title: Voeg afbeelding toe
       image_optional_text: optionele titel
       image_hosting_hint: "Heb je een een gratis stek voor je afbeelding nodig?"
       olist_title: Genummerde lijst
@@ -489,7 +489,7 @@ nl:
       moved_post: " {{username}} verplaatst naar {{link}}"
       total_flagged: aantal gemarkeerde berichten
 
-    image_selector:
+    upload_selector:
       title: Voeg afbeelding toe
       from_my_computer: Vanaf mijn apparaat
       from_the_web: Vanaf het web
@@ -499,7 +499,7 @@ nl:
       local_title: lokale afbeelding
       local_tip: "klik om een afbeelding vanaf je apparaat te selecteren."
       upload: Uploaden
-      uploading_image: Afbeelding uploaden
+      upload_file: Afbeelding uploaden
 
     search:
       title: "zoek naar topics, posts, leden of categoriëen"
diff --git a/config/locales/client.pseudo.yml b/config/locales/client.pseudo.yml
index 111d79d90c1..be4af67e69a 100644
--- a/config/locales/client.pseudo.yml
+++ b/config/locales/client.pseudo.yml
@@ -429,9 +429,9 @@ pseudo:
       quote_text: '[[ Ɓłóčǩƣůóťé ]]'
       code_title: '[[ Čóďé Šáɱƿłé ]]'
       code_text: '[[ éɳťéř čóďé ĥéřé ]]'
-      image_title: '[[ Íɱáǧé ]]'
-      image_description: '[[ éɳťéř íɱáǧé ďéščříƿťíóɳ ĥéřé ]]'
-      image_dialog_title: '[[ Íɳšéřť Íɱáǧé ]]'
+      upload_title: '[[ Íɱáǧé ]]'
+      upload_description: '[[ éɳťéř íɱáǧé ďéščříƿťíóɳ ĥéřé ]]'
+      upload_dialog_title: '[[ Íɳšéřť Íɱáǧé ]]'
       image_optional_text: '[[ óƿťíóɳáł ťíťłé ]]'
       image_hosting_hint: '[[ Ѝééď <á ĥřéƒ=''ĥťťƿ://ŵŵŵ.ǧóóǧłé.čóɱ/šéářčĥ?ƣ=ƒřéé+íɱáǧé+ĥóšťíɳǧ''
         ťářǧéť=''_ƀłáɳǩ''>ƒřéé íɱáǧé ĥóšťíɳǧ? ]]'
@@ -474,7 +474,7 @@ pseudo:
       moved_post: '[[ <í ťíťłé=''ɱóνéď ƿóšť'' čłášš=''íčóɳ íčóɳ-ářřóŵ-říǧĥť''>
         {{username}} ɱóνéď ťó {{link}} ]]'
       total_flagged: '[[ ťóťáł ƒłáǧǧéď ƿóšťš ]]'
-    image_selector:
+    upload_selector:
       title: '[[ Íɳšéřť Íɱáǧé ]]'
       from_my_computer: '[[ Ƒřóɱ Ϻý Ďéνíčé ]]'
       from_the_web: '[[ Ƒřóɱ Ťĥé Ŵéƀ ]]'
@@ -485,7 +485,7 @@ pseudo:
       local_title: '[[ łóčáł íɱáǧé ]]'
       local_tip: '[[ čłíčǩ ťó šéłéčť áɳ íɱáǧé ƒřóɱ ýóůř ďéνíčé. ]]'
       upload: '[[ Ůƿłóáď ]]'
-      uploading_image: '[[ Ůƿłóáďíɳǧ íɱáǧé ]]'
+      upload_file: '[[ Ůƿłóáďíɳǧ íɱáǧé ]]'
     search:
       title: '[[ šéářčĥ ƒóř ťóƿíčš, ƿóšťš, ůšéřš, óř čáťéǧóříéš ]]'
       placeholder: '[[ ťýƿé ýóůř šéářčĥ ťéřɱš ĥéřé ]]'
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 9315f73c1f8..18adc1962fa 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -301,14 +301,14 @@ pt:
       invitee_accepted: " {{username}} aceitou o teu convite"
       moved_post: " {{username}} moveu o post para {{link}}"
 
-    image_selector:
+    upload_selector:
       from_my_computer: "Do meu dispositivo"
       from_the_web: "Da internet"
       add_image: "Adicionar Imagem"
       remote_tip: "insere o endereço de uma imagem no formato http://example.com/image.jpg"
       local_tip: "clica para selecionar uma imagem no teu dispositivo."
       upload: "Enviar"
-      uploading_image: "A enviar imagem"
+      upload_file: "A enviar imagem"
 
     search:
       title: "procurar por tópicos, posts, utilizadores, ou categorias"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 6add65a8eb2..461fd804911 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -455,9 +455,9 @@ ru:
       quote_text: Цитата
       code_title: Фрагмент кода
       code_text: вводите код здесь
-      image_title: Изображение
-      image_description: введите здесь описание изображения
-      image_dialog_title: Вставка изображения
+      upload_title: Изображение
+      upload_description: введите здесь описание изображения
+      upload_dialog_title: Вставка изображения
       image_optional_text: необязательное название
       image_hosting_hint: "Нужен бесплатный хостинг изображений?"
       olist_title: Нумерованный список
@@ -488,7 +488,7 @@ ru:
       invitee_accepted: " {{username}} принял ваше приглашение"
       moved_post: " {{username}} перенес сообщение в {{link}}"
       total_flagged: всего сообщений с жалобами
-    image_selector:
+    upload_selector:
       title: Вставка изображения
       from_my_computer: С устройства
       from_the_web: Из интернета
@@ -498,7 +498,7 @@ ru:
       local_title: локальное изображение
       local_tip: выбрать изображение с устройства.
       upload: Загрузить
-      uploading_image: Загрузка изображения
+      upload_file: Загрузка изображения
     search:
       title: поиск по темам, сообщениям, пользователям или категориям
       placeholder: условия поиска...
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 332ab576d76..e2c93c56ca9 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -325,9 +325,9 @@ sv:
       quote_text: "Citat"
       code_title: "Kodexempel"
       code_text: "skriv din kod här"
-      image_title: "Bild"
-      image_description: "skriv en bildbeskrivning här"
-      image_dialog_title: "Infoga Bild"
+      upload_title: "Bild"
+      upload_description: "skriv en bildbeskrivning här"
+      upload_dialog_title: "Infoga Bild"
       image_optional_text: "valfri titel"
       image_hosting_hint: "Behöver du gratis bilduppladdning?"
       olist_title: "Numrerad Lista"
@@ -355,7 +355,7 @@ sv:
       invitee_accepted: " {{username}} accepterade din inbjudan"
       moved_post: " {{username}} flyttade inlägg till {{link}}"
 
-    image_selector:
+    upload_selector:
       title: "Infoga Bild"
       from_my_computer: "Från Min Enhet"
       from_the_web: "Från Internet"
@@ -363,7 +363,7 @@ sv:
       remote_tip: "skriv in en adress till en bild i formen http://exempel.se/bild.jpg"
       local_tip: "klicka för att välja en bild från din enhet."
       upload: "Ladda Upp"
-      uploading_image: "Laddar upp bild"
+      upload_file: "Laddar upp bild"
 
     search:
       title: "sök efter trådar, inlägg, användare, eller kategorier"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index aa4bd13c8da..07b5fc8bf0a 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -441,9 +441,9 @@ zh_CN:
       quote_text: "引用"
       code_title: "代码"
       code_text: "在此输入代码"
-      image_title: "图片"
-      image_description: "在此输入图片描述"
-      image_dialog_title: "插入图片"
+      upload_title: "图片"
+      upload_description: "在此输入图片描述"
+      upload_dialog_title: "插入图片"
       image_optional_text: "可选标题"
       image_hosting_hint: "需要 免费图片存储？"
       olist_title: "数字列表"
@@ -477,7 +477,7 @@ zh_CN:
       moved_post: " {{username}} 已将帖子移动到 {{link}}"
       total_flagged: "被投诉帖子的总数"
 
-    image_selector:
+    upload_selector:
       title: "插入图片"
       from_my_computer: "来自我的设备"
       from_the_web: "来自网络"
@@ -487,7 +487,7 @@ zh_CN:
       local_title: "本地图片"
       local_tip: "点击从你的设备中选择一张图片。"
       upload: "上传"
-      uploading_image: "上传图片中"
+      upload_file: "上传图片中"
 
     search:
       title: "搜索主题、帖子、用户或分类"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index a81583abbd7..73361f3cfb2 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -382,9 +382,9 @@ zh_TW:
       quote_text: "引用"
       code_title: "代碼"
       code_text: "在此輸入代碼"
-      image_title: "圖片"
-      image_description: "在此輸入圖片描述"
-      image_dialog_title: "插入圖片"
+      upload_title: "圖片"
+      upload_description: "在此輸入圖片描述"
+      upload_dialog_title: "插入圖片"
       image_optional_text: "可選標題"
       image_hosting_hint: "需要 免費圖片存儲？"
       olist_title: "數字列表"
@@ -418,7 +418,7 @@ zh_TW:
       moved_post: " {{username}} 已將帖子移動到 {{link}}"
       total_flagged: "被投訴帖子的總數"
 
-    image_selector:
+    upload_selector:
       title: "插入圖片"
       from_my_computer: "來自我的設備"
       from_the_web: "來自網絡"
@@ -428,7 +428,7 @@ zh_TW:
       local_title: "本地圖片"
       local_tip: "點擊從你的設備中選擇一張圖片。"
       upload: "上傳"
-      uploading_image: "上傳圖片中"
+      upload_file: "上傳圖片中"
 
     search:
       title: "搜索主題、帖子、用戶或分類"