Merge pull request #6098 from jeromedalbert/master

Rename "Website url" labels to "Website"

app/views/admin/users/_form.html.haml

@@ -81,7 +81,7 @@
         = f.label :twitter, class: 'control-label'
         .col-sm-10= f.text_field :twitter, class: 'form-control'
       .form-group
-        = f.label :website_url, class: 'control-label'
+        = f.label :website_url, 'Website', class: 'control-label'
         .col-sm-10= f.text_field :website_url, class: 'form-control'
 
     .form-actions

app/views/profiles/show.html.haml

@@ -47,7 +47,7 @@
         = f.label :twitter, class: "control-label"
         .col-sm-10= f.text_field :twitter, class: "form-control"
       .form-group
-        = f.label :website_url, class: "control-label"
+        = f.label :website_url, 'Website', class: "control-label"
         .col-sm-10= f.text_field :website_url, class: "form-control"
       .form-group
         = f.label :bio, class: "control-label"

app/views/users/_profile.html.haml

@@ -19,7 +19,7 @@
         %strong= link_to user.twitter, "http://www.twitter.com/#{user.twitter}"
     - unless user.website_url.blank?
       %li
-        %span.light Website url:
+        %span.light Website:
         %strong= link_to user.short_website_url, user.full_website_url
     - unless user.bio.blank?
       %li