summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-07-14 10:08:36 -0400
committerChristopher Speller <crspeller@gmail.com>2016-07-14 10:08:36 -0400
commitcaabfbcdd56bdced7c5c1d38e00f488adffe7c60 (patch)
tree4d52326767246f331da352f0427e34bf714e3130 /i18n
parent8e810bc2ebb743717b5b0fc4541fcd3b2565966c (diff)
downloadchat-caabfbcdd56bdced7c5c1d38e00f488adffe7c60.tar.gz
chat-caabfbcdd56bdced7c5c1d38e00f488adffe7c60.tar.bz2
chat-caabfbcdd56bdced7c5c1d38e00f488adffe7c60.zip
PLT-2992 Added the ability to use different themes for each team (#3411)
* Cleaned up user_settings_theme.jsx and import_theme_modal.jsx * Made ImportThemeModal use a callback to return the theme to the user settings modal instead of saving it directly * Moved user theme from model to preferences * Added serverside API to delete preferences TODO update package with client stuff * Changed constants.jsx so that Preferences and ActionTypes can be imported on their own * Updated ThemeProps migration code to properly rename solarized code themes * Fixed warnings thrown by AppDispatcher * Added clientside UI to support team-specific themes * Removed debugging code from test * Fixed setting a user's theme when they haven't set their theme before
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json24
1 files changed, 20 insertions, 4 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 961ddc50c..ab6dd4f87 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1140,6 +1140,14 @@
"translation": "Unable to get post"
},
{
+ "id": "api.preference.delete_preferences.decode.app_error",
+ "translation": "Unable to decode preferences from request"
+ },
+ {
+ "id": "api.preference.delete_preferences.user_id.app_error",
+ "translation": "Unable to delete preferences for other user"
+ },
+ {
"id": "api.preference.init.debug",
"translation": "Initializing preference api routes"
},
@@ -3012,6 +3020,10 @@
"translation": "Invalid name"
},
{
+ "id": "model.preference.is_valid.theme.app_error",
+ "translation": "Invalid theme"
+ },
+ {
"id": "model.preference.is_valid.value.app_error",
"translation": "Value is too long"
},
@@ -3176,10 +3188,6 @@
"translation": "Invalid team id"
},
{
- "id": "model.user.is_valid.theme.app_error",
- "translation": "Invalid theme"
- },
- {
"id": "model.user.is_valid.update_at.app_error",
"translation": "Update at must be a valid time"
},
@@ -3776,6 +3784,10 @@
"translation": "We couldn't update the Post"
},
{
+ "id": "store.sql_preference.delete.app_error",
+ "translation": "We encountered an error while deleting preferences"
+ },
+ {
"id": "store.sql_preference.delete_unused_features.debug",
"translation": "Deleting any unused pre-release features"
},
@@ -4056,6 +4068,10 @@
"translation": "We could not get the unread message count for the user"
},
{
+ "id": "store.sql_user.migrate_theme.critical",
+ "translation": "Failed to migrate User.ThemeProps to Preferences table %v"
+ },
+ {
"id": "store.sql_user.missing_account.const",
"translation": "We couldn't find an existing account matching your email address for this team. This team may require an invite from the team owner to join."
},