From 1072c7a213baeace777d18b888eb43086afeb87e Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 23 Aug 2022 02:26:09 -0700
Subject: generate new invoice on tip

---
 src/lib/utils.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/lib')

diff --git a/src/lib/utils.js b/src/lib/utils.js
index a1bdf8d7..65025c3a 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -47,6 +47,8 @@ export const put = (url, body, headers) => {
 		method: 'PUT',
 		body: JSON.stringify(body),
 		headers
+	}).then(async (r) => {
+		if (!r.ok) throw new Error('put failed');
 	});
 };
 
-- 
cgit v1.2.3


From 5de2a508609f84af1b94f53b098b05092599150c Mon Sep 17 00:00:00 2001
From: Adrien Hopkins <ahopk127@my.yorku.ca>
Date: Tue, 23 Aug 2022 10:43:30 -0500
Subject: fixed broken translations & use json locales instead of JS

---
 src/components/About.svelte          |  11 +-
 src/lib/translations/index.js        |  23 +++-
 src/lib/translations/lang.json       |   2 +-
 src/lib/translations/translations.js | 225 -----------------------------------
 4 files changed, 30 insertions(+), 231 deletions(-)
 delete mode 100644 src/lib/translations/translations.js

(limited to 'src/lib')

diff --git a/src/components/About.svelte b/src/components/About.svelte
index 794a5107..3cd25f8c 100644
--- a/src/components/About.svelte
+++ b/src/components/About.svelte
@@ -54,9 +54,14 @@
 		</div>
 	</div>
 
-	<ul
-		class="w-full mx-auto md:w-[700px] lg:w-[500px] xl:w-auto text-secondary px-1 md:px-10 text-xl list-disc space-y-5"
-	/>
+	<ul class="w-full mx-auto md:w-[700px] lg:w-[500px] xl:w-auto text-secondary px-1 md:px-10 text-xl list-disc space-y-5">
+      <li>{$t('about.founder.qualifications.bitcoin')}</li>
+      <li>{$t('about.founder.qualifications.webDev')}</li>
+      <li>{$t('about.founder.qualifications.bitcoinVancouver')}</li>
+      <li>{$t('about.founder.qualifications.bitcoinCoop')}</li>
+      <li>{$t('about.founder.qualifications.beliefs')}</li>
+      <li>{$t('about.founder.qualifications.familialRelationships')}</li>
+  </ul>
 </div>
 
 <div class="mt-20">
diff --git a/src/lib/translations/index.js b/src/lib/translations/index.js
index 023da884..6ed83689 100644
--- a/src/lib/translations/index.js
+++ b/src/lib/translations/index.js
@@ -1,9 +1,28 @@
 import i18n from 'sveltekit-i18n';
-import translations from './translations';
+import lang from './lang.json';
 
 const config = {
 	initLocale: 'en',
-	translations
+  translations: {
+    en: { lang },
+    fr: { lang }
+  },
+  loaders: [
+    {
+      locale: 'en',
+      key: '',
+      loader: async () => (
+        await import("../../locales/en.json")
+      ).default
+    },
+    {
+      locale: 'fr',
+      key: '',
+      loader: async () => (
+        await import("../../locales/fr.json")
+      ).default
+    }
+  ]
 };
 
 export const { t, l, locales, locale } = new i18n(config);
diff --git a/src/lib/translations/lang.json b/src/lib/translations/lang.json
index 6cf55908..b01c522b 100644
--- a/src/lib/translations/lang.json
+++ b/src/lib/translations/lang.json
@@ -1,4 +1,4 @@
 {
 	"en": "English",
-	"fr": "French"
+	"fr": "Français"
 }
diff --git a/src/lib/translations/translations.js b/src/lib/translations/translations.js
deleted file mode 100644
index 5066b818..00000000
--- a/src/lib/translations/translations.js
+++ /dev/null
@@ -1,225 +0,0 @@
-import lang from './lang.json';
-
-export default {
-	en: {
-		404: {
-			404: '404',
-			pageNotFound: 'Page not found.'
-		},
-		about: {
-			header: 'About',
-			p1: '<strong>CoinOS</strong> is an <strong>open source</strong> bitcoin web wallet, point of sale, ecommerce marketplace and exchange platform. Development started in Vancouver in September 2012 as a way to provide local merchants with a convenient way to accept bitcoin payments.',
-			p2: 'The feature set has grown over the years to accomodate a wide variety of use cases with the goal of making it as easy as possible for anyone to get started using bitcoin quickly, cheaply, and securely.',
-			p3: "Anyone can download the source code and host their own instance of the platform backed by their own bitcoin, liquid or lightning nodes, or reach out and we'll gladly set this up for you.",
-			p4: 'Intra-account transfers between custodial wallets of different users on our server are completely free, instant, and unlimited.',
-			founder: {
-				header: 'The Founder',
-				name: 'Adam Soltys',
-				position: 'Chief Technical Officer',
-				qualifications: [
-					'Running bitcoin since 2011',
-					'20+ years web development experience in government and industry',
-					'Early bitcoin Vancouver meetup organizer',
-					'Founder of The bitcoin Co-op and early supporter of Decentral Vancouver',
-					'Yogi, permaculturist, anarchist, decentralist',
-					'Husband, father, brother, son'
-				]
-			}
-		},
-		error: {
-			header: 'Error',
-			message: 'Please try again or contact support.',
-			signIn: 'Please sign in to continue.'
-		},
-		faq: {
-			header: 'FAQ',
-			cost: {
-				question: 'What does it cost?',
-				answer:
-					'CoinOS is free to use. You only pay a 1% fee if/when you withdraw your funds. Compare this to 3% typically charged by a credit card processor.'
-			},
-			compatibility: {
-				question: 'Do I need any special device or software?',
-				answer:
-					'No. CoinOS is web-based, so as long as you have an internet connection, you can use it on any device or hardware. Most merchants might use it on a phone or a tablet.'
-			},
-			safety: {
-				question: 'Are my funds safe?',
-				answer:
-					'Your funds are stored on our secure server, however we recommend that you withdraw them to your own cold storage for long-term savings.'
-			}
-		},
-		footer: {
-			followUs: 'Follow Us',
-			twitter: 'Twitter',
-			github: 'GitHub',
-			company: 'Company',
-			telegram: 'Telegram',
-			support: 'Support',
-			jobs: 'Jobs'
-		},
-		howItWorks: {
-			header: 'How It Works',
-			step1: {
-				header: '1. Create your account',
-				description: 'A username & password is all you need to get started.'
-			},
-			step2: {
-				header: '2. Ask for payments',
-				description: 'The same as you normally would, but with bitcoin.'
-			},
-			step3: {
-				header: "3. That's all!",
-				description: 'You can convert to local currency at any point.'
-			}
-		},
-		invoice: {
-			addTip: 'Add a tip',
-			addTipq: 'Add a tip?',
-			done: 'Done',
-			paymentSuccessful: 'Payment Successful!'
-		},
-		jobs: {
-			header: 'Jobs',
-			subheader: 'Current Openings',
-			pitch1:
-				'CoinOS is actively looking for developers to join our growing team (full-time or part-time, remote working OK).',
-			pitch2:
-				'Excited about working on open source bitcoin? Then take a look at our repositories on',
-			github: 'GitHub',
-			pitch3:
-				"If you think you can make an impact, we'd love to hear from you. Send us your resume to"
-		},
-		landing: {
-			header_before_icon: 'The',
-			header_with_icon: 'easiest',
-			header_after_icon: 'way to accept bitcoin in your store.',
-			subheader:
-				'Grow your customer base and revenue by accepting bitcoin with an easy-to-use and managed Point of Sale. No software or hardware required.',
-			info1: {
-				title: 'Instant payments via Lightning',
-				description:
-					'The moment your customer sends a payment, it’s there. No waiting for bank settlements or worrying about chargebacks. Instant settlement, in seconds. Say goodbye to 3% credit card processing fees.'
-			},
-			info2: {
-				title: 'Simple to use, custodial by default',
-				description1: 'Just enter an amount, share QR code and you’re done.',
-				description2:
-					'CoinOS is custodial by default, which eliminates the need to understand how bitcoin/lightning works. We do all the heavy lifting so you can focus on your business.',
-				description3:
-					'You always have the option of <span class="underline underline-offset-4">taking custody</span> of your own keys.'
-			},
-			info3: {
-				title: 'Brand it your way!',
-				description:
-					'Customize your point of sale look and feel, or keep it on default - totally up to you.'
-			}
-		},
-		login: {
-			username: 'Username',
-			password: 'Password',
-			passwordRecommendation:
-				'We recommend a long, random password generated with a password manager.',
-			forgotPassword: 'Forgot Password?',
-			haveAccount: 'Already have an account?',
-			noAccount: "Don't have an account?",
-			register: 'Register',
-			signIn: 'Sign In',
-			failed: 'Login failed'
-		},
-		nav: {
-			startInSeconds: 'Start in Seconds',
-			account: 'Account',
-			signIn: 'Sign In',
-			signOut: 'Sign Out',
-			dashboard: 'Dashboard',
-			settings: 'Settings',
-			support: 'Support'
-		},
-		user: {
-			addressGoesHere: 'Address goes here',
-			follow: 'Follow',
-			remove: 'Remove',
-			scanToPayBTC: 'Scan to pay with bitcoin',
-			dashboard: {
-				ACCOUNT_BALANCE: 'ACCOUNT BALANCE',
-				bitcoinPrice: 'Bitcoin Price:',
-				conversionFeeWarning:
-					'You will be charged a 1% conversion fee if you withdraw more of a certain type of Bitcoin than you deposit.',
-				dataFromBinance: 'Data from <span class="text-black">Binance</span>.',
-				fetchingRate: 'fetching rate...',
-				optionalNote: 'Note (Optional)',
-				send: 'Send',
-				withdraw: 'Withdraw'
-			},
-			receive: {
-				lessThan1BTCWarning: 'Please enter an amount less than 1 bitcoin.',
-				showQR: 'Show QR'
-			},
-			settings: {
-				header: 'Settings',
-				ACCOUNT: 'ACCOUNT',
-				POINT_OF_SALE: 'POINT OF SALE',
-				SECURITY: 'SECURITY',
-				locale: 'Language',
-				username: 'Username',
-				newPassword: 'New Password',
-				businessAddress: 'Business Address',
-				emailNotifications: 'Email Notifications',
-				emailNotificationsDescription:
-					'Get notified via email when a change occurs on your account or when people send you payments.',
-				smsNotifications: 'SMS Notifications',
-				smsNotificationsDescription:
-					'CoinOS will send you text notifications when this is enabled.',
-				theme: 'Color Theme',
-				themeDescription: 'Select from the default color themes.',
-				localCurrency: 'Local Currency',
-				btcUnit: 'Display bitcoin in:',
-				bitcoin: 'Bitcoin',
-				satoshis: 'Satoshis',
-				securityPIN: 'Security PIN',
-				securityPINDescription:
-					'Set a security pin that will be used to unlock your settings and to send outgoing payments.',
-				setPIN: 'Set PIN',
-				autoLock: 'Auto-Lock Timer',
-				autoLockDescription:
-					'Your account will go into a secure mode automatically after a specified time:',
-				twofa: '2-Factor Authentication',
-				twofaDescription:
-					'Add an extra level of security to your device by enableing 2-factor authentication.',
-				twofaSetup: 'Set up 2FA'
-			},
-			support: {
-				header: 'Support',
-				email: 'Email',
-				accountName: 'Account Name',
-				message: 'Message',
-				send: 'Send'
-			},
-			transactions: {
-				header: 'Transaction History',
-				AMOUNT: 'AMOUNT',
-				TYPE: 'TYPE',
-				TIME: 'TIME',
-				sent: 'Sent',
-				received: 'Received',
-				empty: 'No transactions yet.'
-			}
-		}
-	},
-	fr: {
-		about: {
-			header: 'À Propos'
-		},
-		faq: {
-			header: 'FAQ'
-		},
-		howItWorks: {
-			header: 'Comment Elle Fonctionne'
-		},
-		nav: {
-			startInSeconds: 'Commence en Secondes',
-			signIn: 'Connexion'
-		}
-	}
-};
-- 
cgit v1.2.3


From 21910fd069b40aa1c63d9ce0651d98a7effc555b Mon Sep 17 00:00:00 2001
From: Adrien Hopkins <ahopk127@my.yorku.ca>
Date: Tue, 23 Aug 2022 11:14:54 -0500
Subject: locale selector uses proper language names & added fallback locale

---
 src/components/LocaleSelector.svelte | 4 ++--
 src/lib/translations/index.js        | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/lib')

diff --git a/src/components/LocaleSelector.svelte b/src/components/LocaleSelector.svelte
index ec5bc781..e1888e9f 100644
--- a/src/components/LocaleSelector.svelte
+++ b/src/components/LocaleSelector.svelte
@@ -1,10 +1,10 @@
 <script>
-	import { locale, locales } from '$lib/translations';
+	import { t, locale, locales } from '$lib/translations';
 	export let style;
 </script>
 
 <select name="language" bind:value={$locale} class={style}>
 	{#each $locales as locale}
-		<option value={locale}>{locale}</option>
+		<option value={locale}>{$t(`lang.${locale}`)}</option>
 	{/each}
 </select>
diff --git a/src/lib/translations/index.js b/src/lib/translations/index.js
index 6ed83689..c8a0a588 100644
--- a/src/lib/translations/index.js
+++ b/src/lib/translations/index.js
@@ -3,6 +3,7 @@ import lang from './lang.json';
 
 const config = {
 	initLocale: 'en',
+  fallbackLocale: 'en',
   translations: {
     en: { lang },
     fr: { lang }
-- 
cgit v1.2.3


From 29129260d8574cfa8deec32cae324e21816f9ecc Mon Sep 17 00:00:00 2001
From: Adrien Hopkins <ahopk127@my.yorku.ca>
Date: Tue, 23 Aug 2022 11:23:20 -0500
Subject: Loaders & translations now generated from lang.json data

---
 src/lib/translations/index.js | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/translations/index.js b/src/lib/translations/index.js
index c8a0a588..dc03c0b6 100644
--- a/src/lib/translations/index.js
+++ b/src/lib/translations/index.js
@@ -1,13 +1,28 @@
 import i18n from 'sveltekit-i18n';
 import lang from './lang.json';
 
+// setup loaders & translations from lang.json data
+function createLocaleLoader(localeCode) {
+  return {
+    locale: localeCode,
+    key: '',
+    loader: async () => (
+      await import(`../../locales/${localeCode}.json`)
+    ).default
+  };
+}
+
+const availableLocales = Object.keys(lang);
+const translations = {};
+for (let i = 0; i < availableLocales.length; i++) {
+  translations[availableLocales[i]] = { lang };
+}
+const loaders = availableLocales.map(createLocaleLoader);
+
 const config = {
 	initLocale: 'en',
   fallbackLocale: 'en',
-  translations: {
-    en: { lang },
-    fr: { lang }
-  },
+  translations: translations,
   loaders: [
     {
       locale: 'en',
-- 
cgit v1.2.3