+
-
+
diff --git a/src/components/widgets/Widgets.jsx b/src/components/widgets/Widgets.jsx
index 89453848..c12a6f03 100644
--- a/src/components/widgets/Widgets.jsx
+++ b/src/components/widgets/Widgets.jsx
@@ -32,8 +32,8 @@ export default class Widgets extends React.PureComponent {
return (
- {enabled('searchBar') ? : null}
- {enabled('greeting') ? : null}
+ {enabled('searchBar') ? : null}
+ {enabled('greeting') ? : null}
{enabled('time') ? : null}
{enabled('date') ? : null}
{enabled('quote') ?
: null}
diff --git a/src/components/widgets/navbar/Navbar.jsx b/src/components/widgets/navbar/Navbar.jsx
index e25544f3..058f1172 100644
--- a/src/components/widgets/navbar/Navbar.jsx
+++ b/src/components/widgets/navbar/Navbar.jsx
@@ -18,7 +18,7 @@ export default class Navbar extends React.PureComponent {
render() {
// toggle refresh button
let refreshHTML = (
-
+
window.location.reload()} />
);
@@ -43,15 +43,15 @@ export default class Navbar extends React.PureComponent {
-
+
{feedbackHTML}
-
+
this.props.openModal('updateModal')} />
{refreshHTML}
-
+
this.props.openModal('mainModal')} />
diff --git a/src/modules/helpers/settings.js b/src/modules/helpers/settings.js
index 4db6021e..5dc93ec6 100644
--- a/src/modules/helpers/settings.js
+++ b/src/modules/helpers/settings.js
@@ -56,14 +56,16 @@ export default class SettingsFunctions {
}
// Languages
- const languageCodes = languages.map(({ code }) => code).splice(1); // remove "en" from list
+ const languageCodes = languages.map(({ code }) => code);
const browserLanguage = (navigator.languages && navigator.languages[0]) || navigator.language;
if (languageCodes.includes(browserLanguage)) {
localStorage.setItem('language', browserLanguage);
- document.documentElement.lang = browserLanguage;
+ if (browserLanguage !== 'en-GB' || browserLanguage !== 'en-US') {
+ document.documentElement.lang = browserLanguage;
+ }
} else {
- localStorage.setItem('language', 'en');
+ localStorage.setItem('language', 'en-GB');
}
if (reset) {
diff --git a/src/modules/languages.json b/src/modules/languages.json
index 964a503d..9debe10f 100644
--- a/src/modules/languages.json
+++ b/src/modules/languages.json
@@ -1,7 +1,11 @@
[
{
- "text": "English",
- "code": "en"
+ "text": "English (UK)",
+ "code": "en-GB"
+ },
+ {
+ "text": "English (US)",
+ "code": "en-US"
},
{
"text": "EspaƱol",
diff --git a/src/modules/other_contributors.json b/src/modules/other_contributors.json
new file mode 100644
index 00000000..29fcfbe1
--- /dev/null
+++ b/src/modules/other_contributors.json
@@ -0,0 +1,6 @@
+[
+ {
+ "login": "FuryingFox",
+ "avatar_url": "https://avatars.githubusercontent.com/u/28787893?v=4"
+ }
+]
\ No newline at end of file
diff --git a/src/translations/en-GB.json b/src/translations/en-GB.json
new file mode 100644
index 00000000..86656c5e
--- /dev/null
+++ b/src/translations/en-GB.json
@@ -0,0 +1,199 @@
+{
+ "widgets": {
+ "greeting": {
+ "morning": "Good Morning",
+ "afternoon": "Good Afternoon",
+ "evening": "Good Evening",
+ "christmas": "Merry Christmas",
+ "newyear": "Happy New Year",
+ "halloween": "Happy Halloween"
+ },
+ "background": {
+ "credit": "Photo by",
+ "information": "Information"
+ },
+ "search": "Search",
+ "navbar": {
+ "tooltips": {
+ "update": "Update Patch Notes",
+ "refresh": "Refresh Page"
+ },
+ "notes": {
+ "title": "Notes",
+ "placeholder": "Type here"
+ }
+ }
+ },
+ "modals": {
+ "main": {
+ "title": "Options",
+ "loading": "Loading...",
+ "navbar": {
+ "settings": "Settings",
+ "addons": "My Add-ons",
+ "marketplace": "Marketplace"
+ },
+ "settings": {
+ "sections": {
+ "time": {
+ "title": "Time",
+ "seconds": "Seconds",
+ "twentyfourhour": "24 Hour",
+ "ampm": "AM/PM (12 hour)",
+ "zero": "Zero-padded",
+ "analog": "Analog",
+ "percentageComplete": "Percentage of the Day Complete",
+ "date": {
+ "title": "Date",
+ "short_date": "Short Date",
+ "short_format": "Short Format",
+ "short_separator": {
+ "title": "Short Separator",
+ "default": "Default",
+ "dash": "Dash",
+ "gaps": "Gaps"
+ }
+ }
+ },
+ "quote": {
+ "title": "Quote",
+ "buttons": "Buttons",
+ "copy": "Copy",
+ "tweet": "Tweet",
+ "favourite": "Favourite"
+ },
+ "greeting": {
+ "title": "Greeting",
+ "events": "Events",
+ "default": "Default Greeting Message",
+ "name": "Name for greeting",
+ "birthday_enabled": "Birthday Enabled",
+ "birthday_date": "Birthday Date"
+ },
+ "background": {
+ "title": "Background",
+ "api": "Background API",
+ "blur": "Adjust Blur",
+ "brightness": "Adjust Brightness",
+ "custom_url": "Custom Background URL",
+ "custom_background": "Custom Background",
+ "custom_colour": "Custom Background Colour",
+ "upload": "Upload",
+ "add_colour": "Add colour",
+ "favourite": "Favourite",
+ "view": "View",
+ "refresh": "Refresh",
+ "disabled": "Disabled"
+ },
+ "search": {
+ "title": "Search",
+ "search_engine": "Search Engine",
+ "custom": "Custom Search URL"
+ },
+ "appearance": "Appearance",
+ "language": "Language",
+ "changelog": "Change Log",
+ "about": {
+ "title": "About",
+ "about": {
+ "copyright": "Copyright",
+ "version": {
+ "title": "Version",
+ "update_available": "Update available",
+ "no_update": "No update available"
+ },
+ "resources_used": {
+ "title": "Resources Used",
+ "bg_images": "Background Images",
+ "pin_icon": "Pin Icon"
+ },
+ "contributors": "Contributors",
+ "supporters": "Supporters"
+ }
+ }
+ },
+ "buttons": {
+ "apply": "Apply",
+ "reset": "Reset",
+ "import": "Import",
+ "export": "Export"
+ }
+ },
+ "marketplace": {
+ "photo_packs": "Photo Packs",
+ "quote_packs": "Quote Packs",
+ "preset_settings": "Preset Settings",
+ "themes": "Themes",
+ "product": {
+ "overview": "Overview",
+ "information": "Information",
+ "last_updated": "Last Updated",
+ "version": "Version",
+ "author": "Author",
+ "notice": {
+ "title": "Notice",
+ "description": "In order for the change to take place, the page must be refreshed."
+ },
+ "buttons": {
+ "addtomue": "Add To Mue",
+ "remove": "Remove"
+ },
+ "quote_warning": {
+ "title": "Warning",
+ "description": "This quote pack requests to external servers that may track you!"
+ }
+ },
+ "offline": {
+ "title": "Looks like you're offline",
+ "description": "Please connect to the internet."
+ },
+ "see_more": "See More"
+ },
+ "addons": {
+ "added": "Added",
+ "empty": {
+ "title": "It's empty here",
+ "description": "Head to the marketplace to add some.",
+ "button": "Take me there"
+ },
+ "sideload": "Sideload"
+ }
+ },
+ "update": {
+ "title": "Update",
+ "offline": {
+ "title": "Offline",
+ "description": "Cannot get update logs while in offline mode"
+ },
+ "error": {
+ "title": "Error",
+ "description": "Could not connect to the server"
+ },
+ "read_blog": "Read on the blog here",
+ "contact_support": "Contact us here"
+ },
+ "welcome": {
+ "title": "Welcome to",
+ "information": "Information",
+ "thankyoumessage1": "Thank you for downloading Mue Tab,",
+ "thankyoumessage2": "we hope you enjoy your time with our extension.",
+ "support": "Support",
+ "close": "Close"
+ },
+ "feedback": {
+ "title": "Give us feedback",
+ "question_one": "How would you rate your experience of this Mue build?",
+ "question_two": "What bugs did you encounter in your use of Mue?",
+ "question_three": "How likely would you be to recommend this version of Mue to a friend of colleague?",
+ "submit": "Submit"
+ }
+ },
+ "toasts": {
+ "quote": "Quote copied",
+ "reset": "Reset successfully",
+ "imported": "Successfully imported",
+ "installed": "Successfully installed",
+ "uninstalled": "Successfully removed",
+ "error": "Something went wrong"
+ }
+}
\ No newline at end of file
diff --git a/src/translations/en-US.json b/src/translations/en-US.json
new file mode 100644
index 00000000..b0796e4c
--- /dev/null
+++ b/src/translations/en-US.json
@@ -0,0 +1,18 @@
+{
+ "modals": {
+ "main": {
+ "settings": {
+ "sections": {
+ "quote": {
+ "favourite": "Favorite"
+ },
+ "background": {
+ "custom_colour": "Custom Background Color",
+ "add_colour": "Add color",
+ "favourite": "Favorite"
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/translations/en.json b/src/translations/en.json
deleted file mode 100644
index bcb579d6..00000000
--- a/src/translations/en.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
- "greeting": {
- "morning": "Good Morning",
- "afternoon": "Good Afternoon",
- "evening": "Good Evening",
- "christmas": "Merry Christmas",
- "newyear": "Happy New Year",
- "halloween": "Happy Halloween"
- },
- "credit": "Photo by",
- "information": "Information",
- "search": "Search",
- "modals": {
- "title": "Options",
- "settings": "Settings",
- "addons": "My Add-ons",
- "marketplace": "Marketplace"
- },
- "settings": {
- "time": {
- "title": "Time",
- "seconds": "Seconds",
- "twentyfourhour": "24 Hour",
- "ampm": "AM/PM (12 hour)",
- "zero": "Zero-padded",
- "analog": "Analog",
- "percentageComplete": "Percentage of the Day Complete"
- },
- "greeting": {
- "title": "Greeting",
- "events": "Events",
- "default": "Default Greeting Message",
- "name": "Name for greeting",
- "birthday_enabled": "Birthday Enabled",
- "birthday_date": "Birthday Date"
- },
- "quote": {
- "title": "Quote",
- "copy": "Copy Button",
- "tweet": "Tweet Button",
- "favourite": "Favourite Button"
- },
- "background": {
- "title": "Background",
- "api": "Background API",
- "blur": "Adjust Blur",
- "brightness": "Adjust Brightness",
- "custom_url": "Custom Background URL",
- "custom_background": "Custom Background",
- "custom_colour": "Custom Background Colour",
- "upload": "Upload",
- "add_colour": "Add colour",
- "favourite": "Favourite",
- "view": "View",
- "refresh": "Refresh",
- "disabled": "Disabled"
- },
- "searchbar": {
- "title": "Search Bar",
- "search_engine": "Search Engine",
- "custom": "Custom Search URL"
- },
- "date": {
- "title": "Date",
- "short_date": "Short Date",
- "short_format": "Short Format",
- "short_separator": {
- "title": "Short Separator",
- "default": "Default",
- "dash": "Dash",
- "gaps": "Gaps"
- }
- },
- "offline": "Offline Mode",
- "dark": "Dark Theme",
- "custom_css": "Custom CSS",
- "experimental": {
- "title": "Experimental",
- "animations": "Animations",
- "voice_search": "Voice Search",
- "night_mode": "Automatic Night Mode"
- },
- "language": "Language",
- "apply": "Apply",
- "reset": "Reset",
- "import": "Import",
- "export": "Export"
- },
- "update": {
- "title": "Update",
- "offline": {
- "title": "Offline",
- "description": "Cannot get update logs while in offline mode"
- },
- "error": {
- "title": "Error",
- "description": "Could not connect to the server"
- },
- "loading": "Loading...",
- "read_blog": "Read on the blog here",
- "contact_support": "Contact us here"
- },
- "toasts": {
- "quote": "Quote Copied",
- "reset": "Reset successfully",
- "installed": "Successfully installed",
- "uninstalled": "Successfully removed",
- "error": "Something went wrong",
- "imported": "Successfully imported"
- },
- "marketplace": {
- "photo_packs": "Photo Packs",
- "quote_packs": "Quote Packs",
- "preset_settings": "Preset Settings",
- "themes": "Themes",
- "product": {
- "overview": "Overview",
- "information": "Information",
- "last_updated": "Last Updated",
- "version": "Version",
- "author": "Author",
- "notice": {
- "title": "Notice",
- "description": "In order for the change to take place, the page must be refreshed."
- },
- "buttons": {
- "addtomue": "Add To Mue",
- "remove": "Remove"
- },
- "quote_warning": {
- "title": "Warning",
- "description": "This quote pack requests to external servers that may track you!"
- }
- },
- "offline": {
- "title": "Looks like you're offline",
- "description": "Please connect to the internet."
- },
- "see_more": "See More"
- },
- "addons": {
- "added": "Added",
- "empty": {
- "title": "It's empty here",
- "description": "Head to the marketplace to add some.",
- "button": "Take me there"
- },
- "sideload": "Sideload"
- },
- "navbar": {
- "tooltips": {
- "update": "Update Patch Notes",
- "refresh": "Refresh Page"
- },
- "notes": {
- "title": "Notes",
- "placeholder": "Type here"
- }
- },
- "welcome": {
- "title": "Welcome to",
- "information": "Information",
- "thankyoumessage1": "Thank you for downloading Mue Tab,",
- "thankyoumessage2": "we hope you enjoy your time with our extension.",
- "support": "Support",
- "close": "Close"
- }
-}
\ No newline at end of file