Skip to content

Commit

Permalink
replaced & with and (publiclab#4930)
Browse files Browse the repository at this point in the history
  • Loading branch information
ananyaarun authored and icarito committed Apr 9, 2019
1 parent 7bab686 commit c6d44e8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/views/editor/_editor.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<span id="create_prompt" class="prompt">
<span style="padding-right:4px;float:left;" class="hidden-sm">
Drag &amp; drop to add an image or file, or
Drag and drop to add an image or file, or
</span>

<!-- http://stackoverflow.com/questions/11235206/twitter-bootstrap-form-file-element-upload-button -->
Expand Down
2 changes: 1 addition & 1 deletion app/views/editor/_main_image.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="side-dropzone" id="side-dropzone">
<p class="prompt">
<span class="hidden-sm">
Drag &amp; drop to add an image, or
Drag and drop to add an image, or
</span>

<!-- http://stackoverflow.com/questions/11235206/twitter-bootstrap-form-file-element-upload-button -->
Expand Down
6 changes: 3 additions & 3 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ en:
ban: "Ban"
_photo:
profile_photo: "Profile photo"
drag_and_drop_image: "Drag &amp; drop to add an image, or"
drag_and_drop_image: "Drag and drop to add an image, or"
choose_image: "choose an image"
uploading: "Uploading"
edit:
Expand Down Expand Up @@ -690,7 +690,7 @@ en:
comments:
_form:
uploading: "Uploading..."
drag_and_drop: "Drag &amp; drop to add an image or file, or"
drag_and_drop: "Drag and drop to add an image or file, or"
choose_one: "choose one"
upload_image: "Upload image"
preview: "Preview"
Expand All @@ -702,7 +702,7 @@ en:
email_notifications: "Author, commenters, and those who've \"liked\" this note will receive email notifications"
_edit:
uploading: "Uploading..."
drag_and_drop: "Drag &amp; drop to add an image or file, or"
drag_and_drop: "Drag and drop to add an image or file, or"
choose_one: "choose one"
upload_image: "Upload image"
preview: "Preview"
Expand Down

0 comments on commit c6d44e8

Please sign in to comment.