Merge remote-tracking branch 'upstream/pull/4798'

[rails.git] / app / views / notes / new.html.erb

diff --git a/app/views/notes/new.html.erb b/app/views/notes/new.html.erb
index 7b3b807e3322da84b21e972daecd7b00d5cd96c4..6728b32ffbc6a501abb252fc6941b3ec3e2cfdcd 100644 (file)
--- a/app/views/notes/new.html.erb
+++ b/app/views/notes/new.html.erb
@@ -3,15 +3,20 @@
 <%= render "sidebar_header", :title => t(".title") %>
 
 <div class="note">
 <%= render "sidebar_header", :title => t(".title") %>
 
 <div class="note">

-  <p class="alert alert-info"><%= t("javascripts.notes.new.intro") %></p>
+  <p class="alert alert-info"><%= t(".intro") %></p>
+  <% if !current_user %>
+    <p class="alert alert-warning"><%= t ".anonymous_warning_html",
+                                         :log_in => link_to(t(".anonymous_warning_log_in"), login_path(:referer => new_note_path)),
+                                         :sign_up => link_to(t(".anonymous_warning_sign_up"), user_new_path) %></p>
+  <% end %>

   <form action="#">
     <input type="hidden" name="lon" autocomplete="off">
     <input type="hidden" name="lat" autocomplete="off">
     <div class="mb-3">
   <form action="#">
     <input type="hidden" name="lon" autocomplete="off">
     <input type="hidden" name="lat" autocomplete="off">
     <div class="mb-3">

-      <textarea class="form-control" name="text" cols="40" rows="10" maxlength="2000" placeholder="<%= t("javascripts.notes.new.advice") %>"></textarea>
+      <textarea class="form-control" name="text" cols="40" rows="10" maxlength="2000" placeholder="<%= t(".advice") %>"></textarea>

     </div>
     <div class="btn-wrapper">
     </div>
     <div class="btn-wrapper">

-      <input type="submit" name="add" value="<%= t("javascripts.notes.new.add") %>" disabled="1" class="btn btn-primary">
+      <input type="submit" name="add" value="<%= t(".add") %>" disabled="1" class="btn btn-primary">

     </div>
   </form>
 </div>
     </div>
   </form>
 </div>