From 96f26042d29dc7ce86c4829dc181f8a97c9f5461 Mon Sep 17 00:00:00 2001
From: David Ralph <me@davidjcralph.co.uk>
Date: Sun, 19 Sep 2021 11:22:53 +0100
Subject: [PATCH] fix: toast duration setting, create quote pack section

---
 .../main/marketplace/sections/Create.jsx      | 53 +++++++++++--------
 .../main/settings/sections/Appearance.jsx     |  2 +-
 src/translations/de_DE.json                   | 11 +++-
 src/translations/en_GB.json                   | 11 +++-
 src/translations/en_US.json                   | 11 +++-
 src/translations/es.json                      | 11 +++-
 src/translations/fr.json                      | 11 +++-
 src/translations/nl.json                      | 11 +++-
 src/translations/no.json                      | 11 +++-
 src/translations/ru.json                      | 11 +++-
 src/translations/zh_CN.json                   | 11 +++-
 11 files changed, 123 insertions(+), 31 deletions(-)

diff --git a/src/components/modals/main/marketplace/sections/Create.jsx b/src/components/modals/main/marketplace/sections/Create.jsx
index 66de88d5..60d24ebc 100644
--- a/src/components/modals/main/marketplace/sections/Create.jsx
+++ b/src/components/modals/main/marketplace/sections/Create.jsx
@@ -1,4 +1,3 @@
-/* eslint-disable no-unused-vars */
 import variables from 'modules/variables';
 import { PureComponent } from 'react';
 import { 
@@ -70,14 +69,20 @@ export default class Create extends PureComponent {
       }
     });
 
-    toast('Imported settings!');
+    toast(variables.getMessage(variables.languagecode, 'toasts.imported'));
   }
 
-  updateQuotePackType(e) {
-    if (e === 'quotePack') {
+  updateQuotePackType(type) {
+    if (type === 'quotePack') {
       this.setState({ 
         addonMetadata: {
-          type: e,
+          type,
+          name: this.state.addonMetadata.name,
+          description: this.state.addonMetadata.description,
+          version: this.state.addonMetadata.version,
+          author: this.state.addonMetadata.author,
+          icon_url: this.state.addonMetadata.icon_url,
+          screenshot_url: this.state.addonMetadata.screenshot_url,
           quotes: [{
             quote: '',
             author: ''
@@ -87,12 +92,18 @@ export default class Create extends PureComponent {
     } else {
       this.setState({ 
         addonMetadata: {
-          type: e,
-          quote_api: {
-            url: '',
-            name: '',
-            author: ''
-          }
+          type,
+          name: this.state.addonMetadata.name,
+          description: this.state.addonMetadata.description,
+          version: this.state.addonMetadata.version,
+          author: this.state.addonMetadata.author,
+          icon_url: this.state.addonMetadata.icon_url,
+          screenshot_url: this.state.addonMetadata.screenshot_url
+        },
+        addonData: {
+          url: '',
+          name: '',
+          author: ''
         }
       });
     }
@@ -187,7 +198,7 @@ export default class Create extends PureComponent {
         <textarea className='settingsTextarea' value={this.state.addonMetadata.description} onInput={(e) => setMetadata(e.target.value, 'description')}/>
         <br/>
         <button onClick={() => this.changeTab(1)} className='uploadbg' style={{ marginRight: '10px' }}>{getMessage('modals.welcome.buttons.previous')}</button>
-        <button onClick={() => this.changeTab(this.state.addonMetadata.type)} className='uploadbg'>{getMessage('modals.welcome.buttons.next')}</button>
+        <button onClick={() => this.changeTab(this.state.addonMetadata.type)} className='uploadbg' disabled={nextDescriptionDisabled}>{getMessage('modals.welcome.buttons.next')}</button>
       </>
     );
 
@@ -218,21 +229,21 @@ export default class Create extends PureComponent {
     const addQuotes = (
       <>
         <h3>{getMessage('modals.main.addons.create.quotes.title')}</h3>
-        <Dropdown label='Type' noSetting onChange={(e) => this.updateQuotePackType(e)}>
-          <option value='quotes'>Local</option>
-          <option value='quote_api'>API</option>
+        <Dropdown label={getMessage('modals.main.settings.sections.time.type')} noSetting onChange={(e) => this.updateQuotePackType(e)}>
+          <option value='quotes'>{getMessage('modals.main.addons.create.quotes.local.title')}</option>
+          <option value='quote_api'>{getMessage('modals.main.addons.create.quotes.api.title')}</option>
         </Dropdown>
         {this.state.addonMetadata.type === 'quote_api' ? <>
-          <h3>API</h3>
-          <p>Quote URL</p>
+          <h3>{getMessage('modals.main.addons.create.quotes.api.title')}</h3>
+          <p>{getMessage('modals.main.addons.create.quotes.api.url')}</p>
           <input type='text' value={this.state.addonData.url} onChange={(e) => this.updateQuotePackAPI('url', e.target.value)}/>
-          <p>JSON Quote Name</p>
+          <p>{getMessage('modals.main.addons.create.quotes.api.name')}</p>
           <input type='text' value={this.state.addonData.name} onChange={(e) => this.updateQuotePackAPI('name', e.target.value)}/>
-          <p>JSON Quote Author (or override)</p>
+          <p>{getMessage('modals.main.addons.create.quotes.api.author')}</p>
           <input type='text' value={this.state.addonData.author} onChange={(e) => this.updateQuotePackAPI('author', e.target.value)}/>
           <br/><br/>
         </> : <>
-          <h3>Local</h3>
+          <h3>{getMessage('modals.main.addons.create.quotes.local.title')}</h3>
           <p>To be implemented</p>
         </>}
         <button onClick={() => this.changeTab(2)} className='uploadbg' style={{ marginRight: '10px' }}>{getMessage('modals.welcome.buttons.previous')}</button>
@@ -252,7 +263,7 @@ export default class Create extends PureComponent {
         <h3>{getMessage('modals.main.addons.create.finish.title')}</h3>
         <button onClick={() => this.downloadAddon()} className='upload'>{getMessage('modals.main.addons.create.finish.download')}</button>
         <br/><br/>
-        <button onClick={() => this.changeTab(this.state.addonMetadata.type)} className='uploadbg' style={{ marginRight: '10px' }}>{getMessage('modals.welcome.buttons.previous')}</button>
+        <button onClick={() => this.changeTab((this.state.addonMetadata.type === 'quote_api') ? 'quotes' : this.state.addonMetadata.type)} className='uploadbg' style={{ marginRight: '10px' }}>{getMessage('modals.welcome.buttons.previous')}</button>
       </>
     );
 
diff --git a/src/components/modals/main/settings/sections/Appearance.jsx b/src/components/modals/main/settings/sections/Appearance.jsx
index 648974a1..9dae95be 100644
--- a/src/components/modals/main/settings/sections/Appearance.jsx
+++ b/src/components/modals/main/settings/sections/Appearance.jsx
@@ -67,7 +67,7 @@ export default function AppearanceSettings() {
       <h3>{getMessage('modals.main.settings.sections.appearance.accessibility.title')}</h3>
       <Checkbox text={getMessage('modals.main.settings.sections.appearance.accessibility.text_shadow')} name='textBorder' category='other'/>
       <Checkbox text={getMessage('modals.main.settings.sections.appearance.accessibility.animations')} name='animations' category='other'/>
-      <Slider title={getMessage('modals.main.settings.sections.appearance.accessibility.toast_duration')} name='toastDisplayTime' default='2500' step='100' min='500' max='5000' toast={true} display={' ' + getMessage('modals.main.settings.sections.appearance.accessibility.miliseconds')} />
+      <Slider title={getMessage('modals.main.settings.sections.appearance.accessibility.toast_duration')} name='toastDisplayTime' default='2500' step='100' min='500' max='5000' toast={true} display={' ' + getMessage('modals.main.settings.sections.appearance.accessibility.milliseconds')} />
     </>
   );
 }
diff --git a/src/translations/de_DE.json b/src/translations/de_DE.json
index 2a9720ba..fac88fda 100644
--- a/src/translations/de_DE.json
+++ b/src/translations/de_DE.json
@@ -448,7 +448,16 @@
             "title": "Fotos hinzufügen"
           },
           "quotes": {
-            "title": "Zitate hinzufügen"
+            "title": "Zitate hinzufügen",
+            "api": {
+              "title": "API",
+              "url": "Quote URL",
+              "name": "JSON quote name",
+              "author": "JSON quote author (or override)"
+            },
+            "local": {
+              "title": "Local"
+            }
           }
         }
       }
diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json
index 24063333..6b861767 100644
--- a/src/translations/en_GB.json
+++ b/src/translations/en_GB.json
@@ -447,7 +447,16 @@
             "title": "Add Photos"
           },
           "quotes": {
-            "title": "Add Quotes"
+            "title": "Add Quotes",
+            "api": {
+              "title": "API",
+              "url": "Quote URL",
+              "name": "JSON quote name",
+              "author": "JSON quote author (or override)"
+            },
+            "local": {
+              "title": "Local"
+            }
           }
         }
       }
diff --git a/src/translations/en_US.json b/src/translations/en_US.json
index 9a71e7d7..1e4af3d6 100644
--- a/src/translations/en_US.json
+++ b/src/translations/en_US.json
@@ -447,7 +447,16 @@
             "title": "Add Photos"
           },
           "quotes": {
-            "title": "Add Quotes"
+            "title": "Add Quotes",
+            "api": {
+              "title": "API",
+              "url": "Quote URL",
+              "name": "JSON quote name",
+              "author": "JSON quote author (or override)"
+            },
+            "local": {
+              "title": "Local"
+            }
           }
         }
       }
diff --git a/src/translations/es.json b/src/translations/es.json
index af62fc70..ab72f99e 100644
--- a/src/translations/es.json
+++ b/src/translations/es.json
@@ -447,7 +447,16 @@
             "title": "Añadir fotos"
           },
           "quotes": {
-            "title": "Añadir citas"
+            "title": "Añadir citas",
+            "api": {
+              "title": "API",
+              "url": "Quote URL",
+              "name": "JSON quote name",
+              "author": "JSON quote author (or override)"
+            },
+            "local": {
+              "title": "Local"
+            }
           }
         }
       }
diff --git a/src/translations/fr.json b/src/translations/fr.json
index f2b26300..0b3ba2c4 100644
--- a/src/translations/fr.json
+++ b/src/translations/fr.json
@@ -447,7 +447,16 @@
             "title": "Add Photos"
           },
           "quotes": {
-            "title": "Add Quotes"
+            "title": "Add Quotes",
+            "api": {
+              "title": "API",
+              "url": "Quote URL",
+              "name": "JSON quote name",
+              "author": "JSON quote author (or override)"
+            },
+            "local": {
+              "title": "Local"
+            }
           }
         }
       }
diff --git a/src/translations/nl.json b/src/translations/nl.json
index 0f02b4d3..bcdcfd7d 100644
--- a/src/translations/nl.json
+++ b/src/translations/nl.json
@@ -447,7 +447,16 @@
             "title": "Add Photos"
           },
           "quotes": {
-            "title": "Add Quotes"
+            "title": "Add Quotes",
+            "api": {
+              "title": "API",
+              "url": "Quote URL",
+              "name": "JSON quote name",
+              "author": "JSON quote author (or override)"
+            },
+            "local": {
+              "title": "Local"
+            }
           }
         }
       }
diff --git a/src/translations/no.json b/src/translations/no.json
index 16e7bc83..77d33baf 100644
--- a/src/translations/no.json
+++ b/src/translations/no.json
@@ -447,7 +447,16 @@
             "title": "Add Photos"
           },
           "quotes": {
-            "title": "Add Quotes"
+            "title": "Add Quotes",
+            "api": {
+              "title": "API",
+              "url": "Quote URL",
+              "name": "JSON quote name",
+              "author": "JSON quote author (or override)"
+            },
+            "local": {
+              "title": "Local"
+            }
           }
         }
       }
diff --git a/src/translations/ru.json b/src/translations/ru.json
index 4931ba16..12018171 100644
--- a/src/translations/ru.json
+++ b/src/translations/ru.json
@@ -447,7 +447,16 @@
             "title": "Add Photos"
           },
           "quotes": {
-            "title": "Add Quotes"
+            "title": "Add Quotes",
+            "api": {
+              "title": "API",
+              "url": "Quote URL",
+              "name": "JSON quote name",
+              "author": "JSON quote author (or override)"
+            },
+            "local": {
+              "title": "Local"
+            }
           }
         }
       }
diff --git a/src/translations/zh_CN.json b/src/translations/zh_CN.json
index d13f4632..12a3f2dd 100644
--- a/src/translations/zh_CN.json
+++ b/src/translations/zh_CN.json
@@ -447,7 +447,16 @@
             "title": "Add Photos"
           },
           "quotes": {
-            "title": "Add Quotes"
+            "title": "Add Quotes",
+            "api": {
+              "title": "API",
+              "url": "Quote URL",
+              "name": "JSON quote name",
+              "author": "JSON quote author (or override)"
+            },
+            "local": {
+              "title": "Local"
+            }
           }
         }
       }