From a51bf0834674f0db26802252d354d8d219c6af1a Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Mon, 11 Aug 2014 16:08:55 -0700
Subject: [PATCH] change "Sign In" back to "Log In" for now

---
 app/views/layouts/application.html.erb | 2 +-
 config/locales/client.en.yml           | 6 +++---
 config/locales/server.en.yml           | 2 +-
 spec/phantom_js/smoke_test.js          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 2cb15528353..95417931462 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -62,7 +62,7 @@
         <input name="username" type="text"     id="signin_username">
         <input name="password" type="password" id="signin_password">
         <input name="redirect" type="hidden">
-        <input type="submit" id="signin-button" value="Sign In">
+        <input type="submit" id="signin-button" value="Log In">
       </form>
     <% end %>
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 58bb6bfb493..668f00f2711 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -97,7 +97,7 @@ en:
     yes_value: "Yes"
     generic_error: "Sorry, an error has occurred."
     generic_error_with_reason: "An error occurred: %{error}"
-    log_in: "Sign In"
+    log_in: "Log In"
     age: "Age"
     last_post: "Last Post"
     joined: "Joined"
@@ -572,7 +572,7 @@ en:
       complete_email: "If an account matches <b>%{email}</b>, you should receive an email with instructions on how to reset your password shortly."
 
     login:
-      title: "Sign In"
+      title: "Log In"
       username: "User"
       password: "Password"
       email_placeholder: "email or username"
@@ -961,7 +961,7 @@ en:
         success: "We mailed out an invitation to <b>{{email}}</b>. We'll notify you when the invitation is redeemed. Check the invitations tab on your user page to keep track of your invites."
         error: "Sorry, we couldn't invite that person. Perhaps they are already a user?"
 
-      login_reply: 'Sign In to Reply'
+      login_reply: 'Log In to Reply'
 
       filters:
         n_posts:
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index f718767691e..3b9c934a487 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -30,7 +30,7 @@ en:
   posts: "posts"
   loading: "Loading"
   powered_by_html: 'Powered by <a href="http://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled'
-  log_in: "Sign In"
+  log_in: "Log In"
 
   via: "%{username} via %{site_name}"
   is_reserved: "is reserved"
diff --git a/spec/phantom_js/smoke_test.js b/spec/phantom_js/smoke_test.js
index 552cb483114..5e65494e999 100644
--- a/spec/phantom_js/smoke_test.js
+++ b/spec/phantom_js/smoke_test.js
@@ -96,7 +96,7 @@ page.runTests = function(){
   });
 
   test("expect a log in button", function(){
-    return $('.login-button').text().trim() === 'Sign In';
+    return $('.login-button').text().trim() === 'Log In';
   });
 
   navigate("navigate to first topic", function(){