Unverified Commit afef279a authored by pskosinski's avatar pskosinski Committed by Benjamin Neff
Browse files

Fix untranslatable photo upload button's hover text 

closes #7429

fixes #7427
parent 78c9cc57

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,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

+3 −0
Original line number Diff line number Diff line
@@ -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

+3 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,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

+1 −1
Original line number Diff line number Diff line
@@ -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"),