From 7a066e814be1510ee69bbea121697d61b79e1548 Mon Sep 17 00:00:00 2001
From: cwm <chriswmartin@protonmail.com>
Date: Sat, 9 Dec 2017 15:15:11 -0600
Subject: [PATCH] moved locales to glitch, created add settings entry

---
 .../glitch/features/local_settings/page/index.js         | 9 +++++++++
 app/javascript/flavours/glitch/features/ui/index.js      | 2 ++
 .../flavours/glitch/reducers/local_settings.js           | 1 +
 app/javascript/glitch/locales/en.json                    | 2 ++
 app/javascript/mastodon/locales/en.json                  | 2 --
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/local_settings/page/index.js b/app/javascript/flavours/glitch/features/local_settings/page/index.js
index 62bf410c69..b9b00b050b 100644
--- a/app/javascript/flavours/glitch/features/local_settings/page/index.js
+++ b/app/javascript/flavours/glitch/features/local_settings/page/index.js
@@ -59,6 +59,15 @@ export default class LocalSettingsPage extends React.PureComponent {
         >
           <FormattedMessage id='settings.navbar_under' defaultMessage='Navbar at the bottom (Mobile only)' />
         </LocalSettingsPageItem>
+        <LocalSettingsPageItem
+          settings={settings}
+          item={['favourite_modal']}
+          id='mastodon-settings--favourite_modal'
+          onChange={onChange}
+        >
+          <FormattedMessage id='settings.favourite_modal' defaultMessage='Show confirmation dialog before favouriting' />
+        </LocalSettingsPageItem>
+
         <section>
           <h2><FormattedMessage id='settings.compose_box_opts' defaultMessage='Compose box options' /></h2>
           <LocalSettingsPageItem
diff --git a/app/javascript/flavours/glitch/features/ui/index.js b/app/javascript/flavours/glitch/features/ui/index.js
index 4a19829164..1e8de033c2 100644
--- a/app/javascript/flavours/glitch/features/ui/index.js
+++ b/app/javascript/flavours/glitch/features/ui/index.js
@@ -57,6 +57,7 @@ const mapStateToProps = state => ({
   layout: state.getIn(['local_settings', 'layout']),
   isWide: state.getIn(['local_settings', 'stretch']),
   navbarUnder: state.getIn(['local_settings', 'navbar_under']),
+  favouriteModal: state.getIn(['local_settings', 'favourite_modal']),
 });
 
 const keyMap = {
@@ -103,6 +104,7 @@ export default class UI extends React.Component {
     isWide: PropTypes.bool,
     systemFontUi: PropTypes.bool,
     navbarUnder: PropTypes.bool,
+    favouriteModal: PropTypes.bool,
     isComposing: PropTypes.bool,
     hasComposingText: PropTypes.bool,
     location: PropTypes.object,
diff --git a/app/javascript/flavours/glitch/reducers/local_settings.js b/app/javascript/flavours/glitch/reducers/local_settings.js
index 69d98741b6..e4cdc49eeb 100644
--- a/app/javascript/flavours/glitch/reducers/local_settings.js
+++ b/app/javascript/flavours/glitch/reducers/local_settings.js
@@ -9,6 +9,7 @@ const initialState = ImmutableMap({
   layout    : 'auto',
   stretch   : true,
   navbar_under : false,
+  favourite_modal : false,
   side_arm  : 'none',
   collapsed : ImmutableMap({
     enabled     : true,
diff --git a/app/javascript/glitch/locales/en.json b/app/javascript/glitch/locales/en.json
index 0276cb8370..94011ffbe7 100644
--- a/app/javascript/glitch/locales/en.json
+++ b/app/javascript/glitch/locales/en.json
@@ -32,6 +32,8 @@
   "status.collapse": "Collapse",
   "status.uncollapse": "Uncollapse",
 
+  "favourite_modal.combo": "You can press {combo} to skip this next time",
+
   "home.column_settings.show_direct": "Show DMs",
 
   "notification.markForDeletion": "Mark for deletion",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 5efd29b815..538124904a 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -25,7 +25,6 @@
   "account.unmute_notifications": "Unmute notifications from @{name}",
   "account.view_full_profile": "View full profile",
   "boost_modal.combo": "You can press {combo} to skip this next time",
-  "favourite_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
   "bundle_column_error.title": "Network error",
@@ -110,7 +109,6 @@
   "home.settings": "Column settings",
   "keyboard_shortcuts.back": "to navigate back",
   "keyboard_shortcuts.boost": "to boost",
-  "keyboard_shortcuts.favourite": "to favourite",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
   "keyboard_shortcuts.description": "Description",