Merge branch 'next-minor' into develop

Changelog.md

@@ -23,6 +23,7 @@
 ## Refactor
 
 ## Bug fixes
+* Make photo upload button hover text translatable [#7429](https://github.com/diaspora/diaspora/pull/7429)
 
 ## Features
 

app/assets/javascripts/app/views/publisher/uploader_view.js

@@ -14,6 +14,9 @@ app.views.PublisherUploader = Backbone.View.extend({
       element: this.el,
       button: this.el,
 
+      text: {
+        fileInputTitle: Diaspora.I18n.t("photo_uploader.upload_photos")
+      },
       request: {
         endpoint: Routes.photos(),
         params: {

app/assets/javascripts/mobile/mobile_file_uploader.js

@@ -23,6 +23,9 @@ function createUploader(){
       sizeLimit: 4194304
     },
     button: document.getElementById("file-upload-publisher"),
+    text: {
+      fileInputTitle: Diaspora.I18n.t("photo_uploader.upload_photos")
+    },
 
     callbacks: {
       onProgress: function(id, fileName, loaded, total) {

app/views/publisher/_publisher.html.haml

@@ -27,7 +27,7 @@
             .publisher-buttonbar#publisher-images
               .btn.btn-link.poll-creator#poll_creator{title: t("shared.publisher.poll.add_a_poll")}
                 %i.entypo-bar-graph
-              .btn.btn-link.file-upload#file-upload{title: t("shared.publisher.upload_photos")}
+              .btn.btn-link.file-upload#file-upload
                 %i.entypo-camera.publisher_image
               .btn.btn-link.locator#locator{title: t("shared.publisher.get_location")}
                 %i.entypo-location.publisher_image

app/views/publisher/_publisher.mobile.haml

@@ -31,7 +31,7 @@
       %ul#photodropzone
     #fileInfo-publisher
 
-    #file-upload-publisher{title: t('shared.publisher.upload_photos'), class: 'btn btn-default'}
+    #file-upload-publisher{class: "btn btn-default"}
       %i.entypo-camera.middle
     #publisher_mobile
       = submit_tag t("shared.publisher.share"),

config/locales/diaspora/en.yml

@@ -1073,7 +1073,6 @@ en:
       formatWithMarkdown: "You can use %{markdown_link} to format your post"
       posting: "Posting..."
       share: "Share"
-      upload_photos: "Upload photos"
       get_location: "Get your location"
       remove_location: "Remove location"
       whats_on_your_mind: "What’s on your mind?"

config/locales/javascript/javascript.en.yml

@@ -210,6 +210,7 @@ en:
       alright_ill_wait: "All right, I’ll wait."
       preparing_your_stream: "Preparing your personalized stream..."
     photo_uploader:
+      upload_photos: "Upload photos"
       looking_good: "OMG, you look awesome!"
       completed: "<%= file %> completed"
       error: "A problem occurred while uploading file <%= file %>"