From 9aca62a53d87ca3fc2f006cff1a38caa0af3559c Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Sun, 11 Jan 2015 03:21:53 -0500 Subject: [PATCH 1/8] added new translatable string emailChange --- locales/en/settings.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/locales/en/settings.json b/locales/en/settings.json index d8eed87c59..005bdec069 100644 --- a/locales/en/settings.json +++ b/locales/en/settings.json @@ -2,7 +2,8 @@ "settings": "Settings", "language": "Language", "americanEnglishGovern": "In the event of a discrepancy in the translations, the American English version governs.", - "helpWithTranslation": "Would you like to help with the translation of HabitRPG? Great! Then visit this Trello card.", + "helpWithTranslation": "Would you like to help with the translation of HabitRPG? Great! Then visit href=\"https://trello.com/c/SvTsLdRF/12-translations\" target=\"_blank\">this Trello card.", "showHeaderPop": "Show your avatar, Health/Experience bars, and party.", "stickyHeader": "Sticky header", "stickyHeaderPop": "Affix the header to the top of the screen. Unchecked means it scrolls out of view.", @@ -45,11 +46,11 @@ "misc": "Misc", "showHeader": "Show Header", "changePass": "Change Password", - "changeUsername": "Change Username", + "changeUsername": "Change Login Name", "oldPass": "Old Password", "newPass": "New Password", "confirmPass": "Confirm New Password", - "newUsername": "New Username", + "newUsername": "New Login Name", "dangerZone": "Danger Zone", "resetText1": "WARNING! This resets many parts of your account. This is highly discouraged, but some people find it useful in the beginning after playing with the site for a short time.", "resetText2": "You will lose all your levels, gold, and experience points. All your tasks will be deleted permanently and you will lose all of your task's historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks.", @@ -68,7 +69,7 @@ "enterNumber": "Please enter a number between 0 and 24", "fillAll": "Please fill out all fields", "passSuccess": "Password successfully changed", - "usernameSuccess": "Username successfully changed", + "usernameSuccess": "Login Name successfully changed", "data": "Data", - "exportData": "Export Data" -} + "exportData": "Export Data", + "emailChange": "To change your email address, please send an email to admin\@habitrpg.com including both your old and new email address as well as your User ID."} From d9cb197d9581ef55738c1f1293bf4364b7e1a294 Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Sun, 11 Jan 2015 03:31:32 -0500 Subject: [PATCH 2/8] added new translatable string emailChange --- locales/en/settings.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/locales/en/settings.json b/locales/en/settings.json index 005bdec069..a018cf8a29 100644 --- a/locales/en/settings.json +++ b/locales/en/settings.json @@ -2,8 +2,7 @@ "settings": "Settings", "language": "Language", "americanEnglishGovern": "In the event of a discrepancy in the translations, the American English version governs.", - "helpWithTranslation": "Would you like to help with the translation of HabitRPG? Great! Then visit href=\"https://trello.com/c/SvTsLdRF/12-translations\" target=\"_blank\">this Trello card.", + "helpWithTranslation": "Would you like to help with the translation of HabitRPG? Great! Then visit this Trello card.", "showHeaderPop": "Show your avatar, Health/Experience bars, and party.", "stickyHeader": "Sticky header", "stickyHeaderPop": "Affix the header to the top of the screen. Unchecked means it scrolls out of view.", From faf69fca8dc5f50f177ae011ca29b10e107d53c9 Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Sun, 11 Jan 2015 10:37:16 -0500 Subject: [PATCH 3/8] added new translatable strings, mailto link --- locales/en/settings.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/locales/en/settings.json b/locales/en/settings.json index a018cf8a29..bef5df1f69 100644 --- a/locales/en/settings.json +++ b/locales/en/settings.json @@ -71,4 +71,8 @@ "usernameSuccess": "Login Name successfully changed", "data": "Data", "exportData": "Export Data", - "emailChange": "To change your email address, please send an email to admin\@habitrpg.com including both your old and new email address as well as your User ID."} + "emailChange": "To change your email address, please send an email to admin@habitrpg.com including both your old and new email address as well as your User ID.", + "username": "Login Name", + "email": "Email", + "registeredWithFb": "Registered with Facebook" +} From ccb1c4cd990584b98062ae5b6a7ce9979b1d4a96 Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Sun, 11 Jan 2015 13:18:39 -0500 Subject: [PATCH 4/8] split emailChange message into 3 parts --- locales/en/settings.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/locales/en/settings.json b/locales/en/settings.json index bef5df1f69..4f0b91f977 100644 --- a/locales/en/settings.json +++ b/locales/en/settings.json @@ -71,7 +71,9 @@ "usernameSuccess": "Login Name successfully changed", "data": "Data", "exportData": "Export Data", - "emailChange": "To change your email address, please send an email to admin@habitrpg.com including both your old and new email address as well as your User ID.", + "emailChange1": "To change your email address, please send an email to", + "emailChange2": "admin@habitrpg.com", + "emailChange3": " including both your old and new email address as well as your User ID.", "username": "Login Name", "email": "Email", "registeredWithFb": "Registered with Facebook" From a505d884522ed0ebf11289d9e5dd15dbec4c2c2e Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Sun, 11 Jan 2015 20:17:36 -0500 Subject: [PATCH 5/8] added translatable strings for display name description --- locales/en/character.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/locales/en/character.json b/locales/en/character.json index 948d6c13b3..913705ebf2 100644 --- a/locales/en/character.json +++ b/locales/en/character.json @@ -129,5 +129,8 @@ "youCast": "You cast <%= spell %>.", "youCastTarget": "You cast <%= spell %> on <%= target %>.", "youCastParty": "You cast <%= spell %> for the party.", - "critBonus": "Critical Hit! Bonus: " + "critBonus": "Critical Hit! Bonus: ", + "displayNameDescription1": "(This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Click", + "displayNameDescription2": "here", + "displayNameDescription3": "if you are trying to edit your login name.)" } From 6c99bbc94810024f0d8d360c79698ff7559c0504 Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Sun, 11 Jan 2015 20:29:36 -0500 Subject: [PATCH 6/8] added translatable strings for login name description --- locales/en/settings.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/locales/en/settings.json b/locales/en/settings.json index 4f0b91f977..833f66ecf8 100644 --- a/locales/en/settings.json +++ b/locales/en/settings.json @@ -76,5 +76,8 @@ "emailChange3": " including both your old and new email address as well as your User ID.", "username": "Login Name", "email": "Email", - "registeredWithFb": "Registered with Facebook" + "registeredWithFb": "Registered with Facebook", + "loginNameDescription1": "This is what you use to login to HabitRPG. Click ", + "loginNameDescription2": "here", + "loginNameDescription3": "to change your display name." } From 45ae1ec7d65b6013e573e5f6324dd56ff336d7d8 Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Sun, 11 Jan 2015 20:31:52 -0500 Subject: [PATCH 7/8] changed display name description to be consistent with login name description --- locales/en/character.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/en/character.json b/locales/en/character.json index 913705ebf2..601d1f13a2 100644 --- a/locales/en/character.json +++ b/locales/en/character.json @@ -130,7 +130,7 @@ "youCastTarget": "You cast <%= spell %> on <%= target %>.", "youCastParty": "You cast <%= spell %> for the party.", "critBonus": "Critical Hit! Bonus: ", - "displayNameDescription1": "(This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Click", + "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Click", "displayNameDescription2": "here", - "displayNameDescription3": "if you are trying to edit your login name.)" + "displayNameDescription3": "if you are trying to edit your login name." } From 41364f6c597fdd4f071bfc7ba32afcf5845e51c4 Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Mon, 12 Jan 2015 21:45:58 -0500 Subject: [PATCH 8/8] modified login/display name info to be more descriptive --- locales/en/character.json | 6 +++--- locales/en/settings.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/locales/en/character.json b/locales/en/character.json index 601d1f13a2..5a11a73c31 100644 --- a/locales/en/character.json +++ b/locales/en/character.json @@ -130,7 +130,7 @@ "youCastTarget": "You cast <%= spell %> on <%= target %>.", "youCastParty": "You cast <%= spell %> for the party.", "critBonus": "Critical Hit! Bonus: ", - "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Click", - "displayNameDescription2": "here", - "displayNameDescription3": "if you are trying to edit your login name." + "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Go to", + "displayNameDescription2": "Settings->Site", + "displayNameDescription3": "and scroll down to the Registration section to change your login name." } diff --git a/locales/en/settings.json b/locales/en/settings.json index 833f66ecf8..8ccb4fe483 100644 --- a/locales/en/settings.json +++ b/locales/en/settings.json @@ -77,7 +77,7 @@ "username": "Login Name", "email": "Email", "registeredWithFb": "Registered with Facebook", - "loginNameDescription1": "This is what you use to login to HabitRPG. Click ", - "loginNameDescription2": "here", - "loginNameDescription3": "to change your display name." + "loginNameDescription1": "This is what you use to login to HabitRPG. Go to ", + "loginNameDescription2": "User->Profile", + "loginNameDescription3": "to change the name that appears in your avatar and chat messages." }