fix bugs

Gemfile.lock

@@ -134,13 +134,10 @@ GEM
     responders (2.4.0)
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
-<<<<<<< 6f1b0d7e93b771fbe7ccbd8f782d6ede8ee2b585
     rsolr (2.0.2)
     rsolr (2.0.2)
       builder (>= 2.1.2)
       builder (>= 2.1.2)
       faraday
       faraday
     rubyzip (1.2.1)
     rubyzip (1.2.1)
-=======
->>>>>>> fix bugs: register mail not show url to download cv
     sass (3.5.3)
     sass (3.5.3)
       sass-listen (~> 4.0.0)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
     sass-listen (4.0.0)

app/views/jobs/job_lists.html.erb

@@ -5,8 +5,8 @@
     </p>
     </p>
     <div class="job-list">
     <div class="job-list">
       <p>
       <p>
-        <span><%= "1. Total: #{@jobs.count}" %></span>
-        <span><%= "Result for: #{@result}" %></span>
+        <span>1. Total: <%= "#{@jobs.count}" %></span>
+        <span>Result for: <%= "#{@result}" %></span>
       </p>
       </p>
       <div class="top-page">
       <div class="top-page">
         <div class="top-page-info">
         <div class="top-page-info">

app/views/my_pages/my_job.html.erb

@@ -10,7 +10,7 @@
           <p>
           <p>
             <span><strong>Location:</strong> <%= "#{job.location}" %></span>
             <span><strong>Location:</strong> <%= "#{job.location}" %></span>
             <span><strong>Salary:</strong> <%= job.salary %></span>
             <span><strong>Salary:</strong> <%= job.salary %></span>
-            <span class="navbar-right"><strong>Applied at:</strong> <%= job.created_at.strftime('%m/%d/%y') %></span>
+            <span class="navbar-right"><strong>Applied at:</strong> <%= I18n.localize(job.created_at, format: :long) %></span>
           </p>
           </p>
         </div>
         </div>
       </div>
       </div>