From 7515376e362eacde024964a99d3daecf6495eadd Mon Sep 17 00:00:00 2001
From: aaronjudd <aaronjudd@me.com>
Date: Fri, 23 Jan 2015 09:45:57 -0800
Subject: [PATCH] randomt updates

 layout, i18n, fixture data updates
---
 .../templates/accounts/dropdown/dropdown.html |   4 +-
 .../templates/cart/checkout/login/login.html  |   2 +-
 .../reaction-core/private/data/Products.json  |   2 +-
 .../reaction-core/private/data/i18n/dev.json  | 405 +++++++++++-------
 .../reaction-core/private/data/i18n/en.json   |   4 +-
 5 files changed, 252 insertions(+), 165 deletions(-)

diff --git a/packages/reaction-core/client/templates/accounts/dropdown/dropdown.html b/packages/reaction-core/client/templates/accounts/dropdown/dropdown.html
index 69b62a1f2a3..e0bcae5d9bc 100644
--- a/packages/reaction-core/client/templates/accounts/dropdown/dropdown.html
+++ b/packages/reaction-core/client/templates/accounts/dropdown/dropdown.html
@@ -9,10 +9,12 @@
   {{>userDropdown}}
   </div>
 {{else}}
+  <div class="accounts-dropdown">
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span data-i18n="accountsUI.signIn">Sign In</span><b class="caret"></b></a>
-    <div class="accounts-dialog accounts-inline dropdown-menu pull-right">
+    <div class="accounts-dialog accounts-layout dropdown-menu pull-right">
     {{> _loginButtonsLoggedOutAllServices}}
     </div>
+  </div>
 {{/if}}
 </div>
 </template>
diff --git a/packages/reaction-core/client/templates/cart/checkout/login/login.html b/packages/reaction-core/client/templates/cart/checkout/login/login.html
index ce3ecf8f411..462da7fa8ab 100644
--- a/packages/reaction-core/client/templates/cart/checkout/login/login.html
+++ b/packages/reaction-core/client/templates/cart/checkout/login/login.html
@@ -1,7 +1,7 @@
 <template name="checkoutLogin">
   <div class="panel panel-default">
     <div class="panel-heading">
-      <h3 class="panel-title"><i class="checkout-step-badge">1</i><span>{{i18n 'checkoutLogin.createOrLogin'}}</span></h3>
+      <h3 class="panel-title"><i class="checkout-step-badge">1</i><span data-i18n="checkoutLogin.createOrLogin">Create an account or sign in to continue</span></h3>
     </div>
     <div class="panel-body">
       <div>
diff --git a/packages/reaction-core/private/data/Products.json b/packages/reaction-core/private/data/Products.json
index cadd44989f3..a958dac1a80 100644
--- a/packages/reaction-core/private/data/Products.json
+++ b/packages/reaction-core/private/data/Products.json
@@ -4,7 +4,7 @@
     "createdAt":{
       "$date":"2014-04-03T13:46:52.411-0700"
     },
-    "description":"This is an example product. Sign in as administrator to edit.\nYou can clone this product from the product grid.\nYou can upload images click or drag in image box on the left here.\nTag this product below, and then add tag in navigation.\nClick the bookmark in the tag to set product url.\nOption variants, price, quantity, and child variants are created by clicking on the variant below, clone the variant to add more options.\nDetails can be added below the image for more specific product information.\nClick the dashboard icon next to the cart for more tools.",
+    "description":"This is an example product. Sign in as administrator to edit.\nYou can clone this product from the product grid.\nYou can upload images click or drag in image box on the left here.\nTag this product below, and then add tag in navigation.\nClick the bookmark in the tag to set product url.\nOption variants, price, quantity, and child variants are created by clicking on the variant below, clone the variant to add more options.\nDetails can be added below the image for more specific product information.\n Login next to the cart, and then click the dashboard icon for more tools.",
     "handle":"example-product",
     "hashtags":[
       "rpjCvTBGjhBi2xdro",
diff --git a/packages/reaction-core/private/data/i18n/dev.json b/packages/reaction-core/private/data/i18n/dev.json
index 1fda7ee09ae..1129cc225e5 100644
--- a/packages/reaction-core/private/data/i18n/dev.json
+++ b/packages/reaction-core/private/data/i18n/dev.json
@@ -4,169 +4,254 @@
         "i18n": "en",
         "entryText": "English",
         "translation": {
-                "core": {
-                    "languages": {
-                        "select": "Select Language",
-                        "english": "English",
-                        "spanish": "Español"
-                    },
-                    "app": {
-                        "save-and-continue": "Save and continue",
-                        "cancel": "Cancel",
-                        "submit": "Submit",
-                        "delete": "Delete"
-                    },
-                    "productDetail": {
-                        "productManagement": "Product management",
-                        "makeInvisible": "Make invisible",
-                        "isNotVisible": "This product is not visible to customers.",
-                        "makeItVisible": "You can make it visible",
-                        "whenYouAreDone": "when you're done editing.",
-                        "tags": "Tags",
-                        "details": "Details",
-                        "options": "Options",
-                        "addToCart": "Add to cart",
-                        "chooseOptions": "Please choose options before adding to cart",
-                        "outOfStock": "Sorry, this item is out of stock!",
-                        "productDeleteError": "There was an error deleting ",
-                        "publishFirst": "Publish product before adding to cart.",
-                        "selectOption": "Select an option before adding to cart",
-                        "addedToCart": "added"
-                    },
-                    "variantList": {
-                        "moreOptions": "There are more options available for this selection.",
-                        "createVariant": "Create Variant"
-                    },
-                    "gridPackage": {
-                        "pkgEnabled": " is now enabled.",
-                        "pkgDisabled": " is now disabled."
-                    },
-                    "cartDrawer": {
-                        "empty": "We're sad. Your cart is empty.",
-                        "keepShopping": "Keep on shopping",
-                        "checkout": "Checkout now"
-                    },
-                    "cartSubTotals": {
-                        "head": "Your cart",
-                        "items": "Items in cart",
-                        "subtotal": "Sub total",
-                        "shipping": "Shipping",
-                        "tax": "Tax",
-                        "total": "Total"
-                    },
-                    "cartDrawerItems": {
-                        "left": "left"
-                    },
-                    "cartCheckout": {
-                        "loginCompleted": "Login completed"
-                    },
-                    "checkoutLogin": {
-                        "create-or-login": "Create an account or sign in to continue"
-                    },
-                    "addressBookGrid": {
-                        "chooseAddress": "Choose shipping & billing address",
-                        "createDefault": "Create your default address",
-                        "selectShipping-address": "Select a shipping address",
-                        "selectBilling-address": "Select a billing address"
-                    },
-                    "addressBookAdd": {
-                        "addAddress": "Add a new address entry",
-                        "createAddress": "Create your default address"
-                    },
-                    "checkoutProgressBar": {
-                        "login": "Login",
-                        "shippingBilling": "Shipping & Billing",
-                        "shippingOptions": "Shipping Options",
-                        "reviewPayment": "Review & Payment",
-                        "complete": "Complete"
+            "core": {
+                "languages": {
+                    "select": "Select Language",
+                    "english": "English",
+                    "spanish": "Español",
+                    "burmese": "Burmese"
+                },
+                "app": {
+                    "saveAndContinue": "Save and continue",
+                    "cancel": "Cancel",
+                    "submit": "Submit",
+                    "delete": "Delete",
+                    "create": "Create",
+                    "close": "Close"
+                },
+                "header": {
+                    "tagsAdd": "Add tag",
+                    "search": "Search products..."
+                },
+                "productDetail": {
+                    "productManagement": "Product management",
+                    "makeInvisible": "Make invisible",
+                    "isNotVisible": "This product is not visible to customers.",
+                    "makeItVisible": "You can make it visible",
+                    "whenYouAreDone": "when you're done editing.",
+                    "tags": "Tags",
+                    "tagsAdd": "Add tag",
+                    "details": "Details",
+                    "detailsName": "Detail name",
+                    "detailsInfo": "Detail information",
+                    "options": "Options",
+                    "addToCart": "Add to cart",
+                    "chooseOptions": "Please choose options before adding to cart",
+                    "outOfStock": "Sorry, this item is out of stock!",
+                    "productDeleteError": "There was an error deleting ",
+                    "publishFirst": "Publish product before adding to cart.",
+                    "selectOption": "Select an option before adding to cart",
+                    "addedToCart": "added"
+                },
+                "productDetailEdit": {
+                    "title": "Product title",
+                    "pagetitle": "Product page title",
+                    "vendor": "Product vendor",
+                    "description": "Add a product description"
+                },
+                "variantList": {
+                    "moreOptions": "There are more options available for this selection.",
+                    "createVariant": "Create Variant"
+                },
+                "gridPackage": {
+                    "pkgEnabled": " is now enabled.",
+                    "pkgDisabled": " is now disabled."
+                },
+                "cartDrawer": {
+                    "empty": "We're sad. Your cart is empty.",
+                    "keepShopping": "Keep on shopping",
+                    "checkout": "Checkout now"
+                },
+                "cartSubTotals": {
+                    "head": "Your cart",
+                    "items": "Items in cart",
+                    "subtotal": "Sub total",
+                    "shipping": "Shipping",
+                    "tax": "Tax",
+                    "total": "Total"
+                },
+                "cartDrawerItems": {
+                    "left": "left"
+                },
+                "cartCheckout": {
+                    "loginCompleted": "Login completed"
+                },
+                "checkoutLogin": {
+                    "createOrLogin": "Create an account or sign in to continue"
+                },
+                "addressBookGrid": {
+                    "chooseAddress": "Choose shipping & billing address",
+                    "createDefault": "Create your default address",
+                    "selectShippingAddress": "Select a shipping address",
+                    "selectBillingAddress": "Select a billing address"
+                },
+                "addressBookAdd": {
+                    "addAddress": "Add a new address entry",
+                    "createAddress": "Create your default address"
+                },
+                "addressBookEdit": {
+                    "editAddress": "Editing this address entry"
+                },
+                "shop": {
+                    "addressBook": {
+                        "country": "Country",
+                        "fullName": "Full name",
+                        "address1": "Address 1",
+                        "address2": "Address 2",
+                        "postal": "Postal",
+                        "city": "City",
+                        "region": "Region",
+                        "phone": "Phone",
+                        "isDefault": "Is this your default address?",
+                        "isCommercial": "Is this a commercial address?"
+                    }
+                },
+                "address": {
+                    "country": "Country",
+                    "fullName": "Full name",
+                    "address1": "Address",
+                    "address2": "Address",
+                    "postal": "Postal",
+                    "city": "City",
+                    "region": "Region",
+                    "phone": "Phone",
+                    "isDefault": "Is this your default address?",
+                    "isCommercial": "Is this a commercial address?"
+                },
+                "checkoutProgressBar": {
+                    "login": "Login",
+                    "shippingBilling": "Address Details",
+                    "shippingOptions": "Shipping Options",
+                    "reviewPayment": "Review",
+                    "complete": "Complete"
+                },
+                "checkoutPayment": {
+                    "addPaymentToCompleteOrder": "Add payment to complete order"
+                },
+                "checkoutReview": {
+                    "review": "Review"
+                },
+                "checkoutShipping": {
+                    "selectShippingOption": "Select shipping option",
+                    "noShippingMethods": "No shipping methods are configured.",
+                    "configureNow": "Configure now."
+                },
+                "shopEditForm": {
+                    "name": "Name",
+                    "email": "Email"
+                },
+                "shopEditAdressForm": {
+                    "company": "Company",
+                    "fullname": "Full name",
+                    "address1": "Address 1"
+                },
+                "dashboardIcon": {
+                    "iconTitle": "View Dashboard",
+                    "text": "Dashboard"
+                },
+                "createProductIcon": {
+                    "iconTitle": "Create product",
+                    "text": "Create"
+                },
+                "social": {
+                    "facebook": "Facebook",
+                    "google": "Google",
+                    "github": "GitHub",
+                    "meetup": "Meetup",
+                    "twitter": "Twitter",
+                    "weibo": "Weibo"
+                },
+                "accountsUI": {
+                    "add": "add",
+                    "and": "and",
+                    "back": "back",
+                    "changePassword": "Change Password",
+                    "choosePassword": "Choose a Password",
+                    "clickAgree": "By clicking Register, you agree to our",
+                    "configure": "Configure",
+                    "createAccount": "Create an Account",
+                    "currentPassword": "Current Password",
+                    "dontHaveAnAccount": "Don't have an account?",
+                    "email": "Email",
+                    "emailAddress": "Email Address",
+                    "emailResetLink": "Email Reset Link",
+                    "forgotPassword": "Reset password",
+                    "ifYouAlreadyHaveAnAccount": "If you already have an account",
+                    "newPassword": "New Password",
+                    "newPasswordAgain": "New Password (again)",
+                    "optional": "Optional",
+                    "or": "or",
+                    "password": "Password",
+                    "passwordAgain": "Password (again)",
+                    "privacyPolicy": "Privacy Policy",
+                    "remove": "remove",
+                    "resetYourPassword": "Reset your password",
+                    "setPassword": "Set Password",
+                    "sign": "Sign",
+                    "signIn": "Sign In",
+                    "signin": "sign in",
+                    "signInWith": "Sign in with",
+                    "signedIn": "You are signed in.",
+                    "signOut": "Sign Out",
+                    "signUp": "Register",
+                    "signupCode": "Registration Code",
+                    "signedIn": "You are signed in.",
+                    "signUpWithYourEmailAddress": "Register with your email address",
+                    "terms": "Terms of Use",
+                    "updateYourPassword": "Update your password",
+                    "username": "Username",
+                    "usernameOrEmail": "Username or email",
+                    "with": "with",
+                    "checkoutAsGuest": "Checkout without user account",
+                    "info": {
+                        "emailSent": "Email Sent",
+                        "emailVerified": "Email verified",
+                        "passwordChanged": "Password Changed",
+                        "passwordReset": "Password Reset"
                     },
-                    "accountsUI": {
-                        "add": "add",
-                        "and": "and",
-                        "back": "back",
-                        "changePassword": "Change Password",
-                        "choosePassword": "Choose a Password",
-                        "clickAgree": "By clicking Register, you agree to our",
-                        "configure": "Configure",
-                        "createAccount": "Create an Account",
-                        "currentPassword": "Current Password",
-                        "dontHaveAnAccount": "Don't have an account?",
-                        "email": "Email",
-                        "emailAddress": "Email Address",
-                        "emailResetLink": "Email Reset Link",
-                        "forgotPassword": "Reset password",
-                        "ifYouAlreadyHaveAnAccount": "If you already have an account",
-                        "newPassword": "New Password",
-                        "newPasswordAgain": "New Password (again)",
-                        "optional": "Optional",
-                        "or": "or",
-                        "password": "Password",
-                        "passwordAgain": "Password (again)",
-                        "privacyPolicy": "Privacy Policy",
-                        "remove": "remove",
-                        "resetYourPassword": "Reset your password",
-                        "setPassword": "Set Password",
-                        "sign": "Sign",
-                        "signIn": "Sign In",
-                        "signin": "sign in",
-                        "signOut": "Sign Out",
-                        "signUp": "Register",
-                        "signupCode": "Registration Code",
-                        "signUpWithYourEmailAddress": "Register with your email address",
-                        "terms": "Terms of Use",
-                        "updateYourPassword": "Update your password",
-                        "username": "Username",
-                        "usernameOrEmail": "Username or email",
-                        "with": "with",
-                        "info": {
-                            "emailSent": "Email Sent",
-                            "emailVerified": "Email verified",
-                            "passwordChanged": "Password Changed",
-                            "passwordReset": "Password Reset"
-                        },
-                        "error": {
-                            "emailRequired": "Email is required.",
-                            "passwordMustBeAtLeast6CharactersLong": "Password must be at least 6 characters long.",
-                            "minChar": "7 character minimum password.",
-                            "pwdsDontMatch": "Passwords don't match",
-                            "pwOneDigit": "Password must have at least one digit.",
-                            "pwOneLetter": "Password requires 1 letter.",
-                            "signInRequired": "You must be signed in to do that.",
-                            "signupCodeIncorrect": "Registration code is incorrect.",
-                            "signupCodeRequired": "Registration code is required.",
-                            "usernameIsEmail": "Username cannot be an email address.",
-                            "usernameRequired": "Username is required.",
-                            "emailAlreadyExists": "Email already exists.",
-                            "emailDoesntMatchTheCriteria": "Email doesn't match the criteria.",
-                            "invalidLoginToken": "Invalid login token",
-                            "loginForbidden": "Login forbidden",
-                            "serviceUnknown": "Service unknown",
-                            "unrecognizedOptionsForLoginRequest": "Unrecognized options for login request",
-                            "userValidationFailed": "User validation failed",
-                            "usernameAlreadyExists": "Username already exists.",
-                            "youAreNotLoggedIn": "You are not logged in.",
-                            "youveBeenLoggedOutByTheServer": "You've been logged out by the server. Please log in again.",
-                            "yourSessionHasExpired": "Your session has expired. Please log in again.",
-                            "noMatchingLoginAttemptFound": "No matching login attempt found",
-                            "passwordIsOld": "Password is old. Please reset your password.",
-                            "incorrectPassword": "Incorrect password",
-                            "invalidEmail": "Invalid email",
-                            "mustBeLoggedIn": "Must be logged in",
-                            "needToSetUsernameOrEmail": "Need to set a username or email",
-                            "oldPasswordFormat": "old password format",
-                            "Password may not be empty": "Password may not be empty",
-                            "signupsForbidden": "Signups forbidden",
-                            "tokenExpired": "Token expired",
-                            "tokenHasInvalidEmailAddress": "Token has invalid email address",
-                            "userHasNoPasswordSet": "User has no password set",
-                            "userNotFound": "User not found",
-                            "verifyEmailLinkExpired": "Verify email link expired",
-                            "verifyEmailLinkIsForUnknownAddress": "Verify email link is for unknown address",
-                            "matchFailed": "Match failed",
-                            "unknownError": "Unknown error"
-                        }
+                    "error": {
+                        "emailRequired": "Email is required.",
+                        "passwordMustBeAtLeast6CharactersLong": "Password must be at least 6 characters long.",
+                        "minChar": "7 character minimum password.",
+                        "pwdsDontMatch": "Passwords don't match",
+                        "pwOneDigit": "Password must have at least one digit.",
+                        "pwOneLetter": "Password requires 1 letter.",
+                        "signInRequired": "You must be signed in to do that.",
+                        "signupCodeIncorrect": "Registration code is incorrect.",
+                        "signupCodeRequired": "Registration code is required.",
+                        "usernameIsEmail": "Username cannot be an email address.",
+                        "usernameRequired": "Username is required.",
+                        "emailAlreadyExists": "Email already exists.",
+                        "emailDoesntMatchTheCriteria": "Email doesn't match the criteria.",
+                        "invalidLoginToken": "Invalid login token",
+                        "loginForbidden": "Login forbidden",
+                        "serviceUnknown": "Service unknown",
+                        "unrecognizedOptionsForLoginRequest": "Unrecognized options for login request",
+                        "userValidationFailed": "User validation failed",
+                        "usernameAlreadyExists": "Username already exists.",
+                        "youAreNotLoggedIn": "You are not logged in.",
+                        "youveBeenLoggedOutByTheServer": "You've been logged out by the server. Please log in again.",
+                        "yourSessionHasExpired": "Your session has expired. Please log in again.",
+                        "noMatchingLoginAttemptFound": "No matching login attempt found",
+                        "passwordIsOld": "Password is old. Please reset your password.",
+                        "incorrectPassword": "Incorrect password",
+                        "invalidEmail": "Invalid email",
+                        "mustBeLoggedIn": "Must be logged in",
+                        "needToSetUsernameOrEmail": "Need to set a username or email",
+                        "oldPasswordFormat": "old password format",
+                        "Password may not be empty": "Password may not be empty",
+                        "signupsForbidden": "Signups forbidden",
+                        "tokenExpired": "Token expired",
+                        "tokenHasInvalidEmailAddress": "Token has invalid email address",
+                        "userHasNoPasswordSet": "User has no password set",
+                        "userNotFound": "User not found",
+                        "verifyEmailLinkExpired": "Verify email link expired",
+                        "verifyEmailLinkIsForUnknownAddress": "Verify email link is for unknown address",
+                        "matchFailed": "Match failed",
+                        "unknownError": "Unknown error"
                     }
                 }
             }
+        }
     }
 ]
diff --git a/packages/reaction-core/private/data/i18n/en.json b/packages/reaction-core/private/data/i18n/en.json
index 94ddd92e655..1129cc225e5 100644
--- a/packages/reaction-core/private/data/i18n/en.json
+++ b/packages/reaction-core/private/data/i18n/en.json
@@ -120,9 +120,9 @@
                 },
                 "checkoutProgressBar": {
                     "login": "Login",
-                    "shippingBilling": "Shipping & Billing",
+                    "shippingBilling": "Address Details",
                     "shippingOptions": "Shipping Options",
-                    "reviewPayment": "Review & Payment",
+                    "reviewPayment": "Review",
                     "complete": "Complete"
                 },
                 "checkoutPayment": {