aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsecondl1ght <[email protected]>2022-08-16 10:59:19 -0600
committersecondl1ght <[email protected]>2022-08-16 10:59:19 -0600
commitc26e004f4a05f231242587c1265a620b7fcd873a (patch)
tree54ac64420712c0343d693b97988a940eda66257e
parent94bb8a163f2d1197544977bdbd3c225a815f9c0e (diff)
downloadcoinos-ui-c26e004f4a05f231242587c1265a620b7fcd873a.tar.gz
coinos-ui-c26e004f4a05f231242587c1265a620b7fcd873a.zip
run format
-rw-r--r--README.md2
-rw-r--r--doc/i18n-technical.md27
-rw-r--r--doc/i18n.md36
-rw-r--r--src/components/LandingHeader.svelte29
-rw-r--r--src/components/LocaleSelector.svelte12
-rw-r--r--src/lib/i18n.js51
-rw-r--r--src/locales/en.json17
-rw-r--r--src/locales/fr.json17
-rw-r--r--src/routes/[username]/settings.svelte8
-rw-r--r--src/routes/__layout.svelte12
10 files changed, 104 insertions, 107 deletions
diff --git a/README.md b/README.md
index 738b0a81..f86424f0 100644
--- a/README.md
+++ b/README.md
@@ -12,4 +12,4 @@ to get started clone the repo and run `pnpm install`, then `pnpm run dev` to get
## Internationalization
-CoinOS has a system for translation using [`svelte-i18n`](https://www.npmjs.com/package/svelte-i18n). For more information and instructions on how to translate CoinOS, click [here](./doc/i18n.md). For technical details, click [here](./doc/i18n-technical.md).
+CoinOS has a system for translation using [`svelte-i18n`](https://www.npmjs.com/package/svelte-i18n). For more information and instructions on how to translate CoinOS, click [here](./doc/i18n.md). For technical details, click [here](./doc/i18n-technical.md).
diff --git a/doc/i18n-technical.md b/doc/i18n-technical.md
index ea28627e..6c45ee01 100644
--- a/doc/i18n-technical.md
+++ b/doc/i18n-technical.md
@@ -1,39 +1,40 @@
# CoinOS Internationalization - Technical Information
-*NOTE: This documentation was written for people with a technical background. If you do not have a technical background, consider reading [this guide](./i18n.md) instead.*
+_NOTE: This documentation was written for people with a technical background. If you do not have a technical background, consider reading [this guide](./i18n.md) instead._
Last Updated: 2022-08-08
## Dependencies
-CoinOS's internationalization system depends on the `npm` package [`svelte-i18n`](https://www.npmjs.com/package/svelte-i18n). Consider reading [its documentation](https://github.com/kaisermann/svelte-i18n/blob/HEAD/docs/Getting%20Started.md) in addition to this.
+CoinOS's internationalization system depends on the `npm` package [`svelte-i18n`](https://www.npmjs.com/package/svelte-i18n). Consider reading [its documentation](https://github.com/kaisermann/svelte-i18n/blob/HEAD/docs/Getting%20Started.md) in addition to this.
## Internationalization Code
-The main code for CoinOS's internationalization is at `src/lib/i18n.js`. When imported, it does the following:
+The main code for CoinOS's internationalization is at `src/lib/i18n.js`. When imported, it does the following:
+
1. Load all of the locales [asynchronously](https://github.com/kaisermann/svelte-i18n/blob/main/docs/Getting%20Started.md#32-asynchronous).
-2. Pick a locale intelligently, depending on the available locales and the navigator locale, using `pickLocale`. Specifically, if the user's locale (e.g. `en-US`) isn't available but its non-regional version (e.g. `en`) is, the system will use the non-regional locale.
+2. Pick a locale intelligently, depending on the available locales and the navigator locale, using `pickLocale`. Specifically, if the user's locale (e.g. `en-US`) isn't available but its non-regional version (e.g. `en`) is, the system will use the non-regional locale.
3. Initialize `svelte-i18n`.
-It also defines important constants, including the list of available locales and the default locale. This code is loaded by importing `$lib/i18n` in `src/routes/__layout.svelte`.
+It also defines important constants, including the list of available locales and the default locale. This code is loaded by importing `$lib/i18n` in `src/routes/__layout.svelte`.
## Locale Files
-Each locale in `coinos-ui-v2` is defined by a JSON file in `src/locales`. Its name is the locale's [ISO 639-1 code](https://en.wikipedia.org/wiki/ISO_639-1) plus `.json`. It is simply a file that maps string IDs to translated strings. Here is an example of `en.json`:
+Each locale in `coinos-ui-v2` is defined by a JSON file in `src/locales`. Its name is the locale's [ISO 639-1 code](https://en.wikipedia.org/wiki/ISO_639-1) plus `.json`. It is simply a file that maps string IDs to translated strings. Here is an example of `en.json`:
```json
{
- "howItWorks": "How It Works",
- "faq": "FAQ",
- "about": "About",
- "startInSeconds": "Start in Seconds",
- "signIn": "Sign In"
+ "howItWorks": "How It Works",
+ "faq": "FAQ",
+ "about": "About",
+ "startInSeconds": "Start in Seconds",
+ "signIn": "Sign In"
}
```
## Internationalizing Strings
-Strings are internationalized by simply using `svelte-i18n`'s [`$format`](https://github.com/kaisermann/svelte-i18n/blob/96a5adab7560249c8881e0612454e01c09273400/docs/Formatting.md) function. A localized string looks like this:
+Strings are internationalized by simply using `svelte-i18n`'s [`$format`](https://github.com/kaisermann/svelte-i18n/blob/96a5adab7560249c8881e0612454e01c09273400/docs/Formatting.md) function. A localized string looks like this:
```
{$_('stringID')}
@@ -43,4 +44,4 @@ Strings are internationalized by simply using `svelte-i18n`'s [`$format`](https:
## The Locale Selector
-CoinOS also has a `LocaleSelector` component, which should be used to select locales. It is a dropdown that allows you to select & update the locale.
+CoinOS also has a `LocaleSelector` component, which should be used to select locales. It is a dropdown that allows you to select & update the locale.
diff --git a/doc/i18n.md b/doc/i18n.md
index e1ed304a..d6f2b4ff 100644
--- a/doc/i18n.md
+++ b/doc/i18n.md
@@ -1,18 +1,18 @@
# CoinOS Internationalization
-CoinOS can be translated into other languages by editing JSON files. You do not need programming knowledge to do this, or to use these instructions. Here are instructions on how to internationalize CoinOS:
+CoinOS can be translated into other languages by editing JSON files. You do not need programming knowledge to do this, or to use these instructions. Here are instructions on how to internationalize CoinOS:
-*NOTE: This guide was written for people without a technical background. If you want more technical details, click [here](./i18n-technical.md).*
+_NOTE: This guide was written for people without a technical background. If you want more technical details, click [here](./i18n-technical.md)._
## Required Background Knowledge
### Language Codes
-Before you can translate CoinOS, you need to know the [ISO 639-1 code](https://en.wikipedia.org/wiki/ISO_639-1) of your language. This is a standard two-letter code that your browser uses to refer to a language (for example, English is `en`, and French is `fr`). You can also add a dash and more letters to refer to a specific region (for example, American English is `en-US`, and British English is `en-GB`). A list of all codes can be found [here](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes), and Firefox-based browsers show you the code when you are selecting your browser's language.
+Before you can translate CoinOS, you need to know the [ISO 639-1 code](https://en.wikipedia.org/wiki/ISO_639-1) of your language. This is a standard two-letter code that your browser uses to refer to a language (for example, English is `en`, and French is `fr`). You can also add a dash and more letters to refer to a specific region (for example, American English is `en-US`, and British English is `en-GB`). A list of all codes can be found [here](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes), and Firefox-based browsers show you the code when you are selecting your browser's language.
### Locale Files
-Each translation of CoinOS is stored in a special *locale file*. These files can be found in the `src/locales` folder in the CoinOS directory. The name of these files is the language code plus "`.json`". A file might look something like this:
+Each translation of CoinOS is stored in a special _locale file_. These files can be found in the `src/locales` folder in the CoinOS directory. The name of these files is the language code plus "`.json`". A file might look something like this:
```JSON
{
@@ -24,7 +24,7 @@ Each translation of CoinOS is stored in a special *locale file*. These files ca
}
```
-Each line (other than the opening and closing braces) contains a **text name**, then a colon (`:`), then the **translated text**. All lines other than the last end in a comma. The text name is a word that is the same in all translations, and is used by the code to access that piece of text. **Both the text name and translated text must be inside quotation marks (`"`).**
+Each line (other than the opening and closing braces) contains a **text name**, then a colon (`:`), then the **translated text**. All lines other than the last end in a comma. The text name is a word that is the same in all translations, and is used by the code to access that piece of text. **Both the text name and translated text must be inside quotation marks (`"`).**
### The Language List
@@ -33,35 +33,37 @@ At the top of the file `src/lib/i18n.js`, there is a list of translations that l
```js
// The list of locales to look for
// ADD ALL NEW LANGUAGE CODES TO THIS LIST
-const localeCodes = ["en", "fr"];
+const localeCodes = ['en', 'fr'];
```
-In order for a translation to be recognized by the CoinOS system, you need to add it to this list. At the end of the list, before the second square bracket, add a comma, then a space, then the language code in quotation marks.
+In order for a translation to be recognized by the CoinOS system, you need to add it to this list. At the end of the list, before the second square bracket, add a comma, then a space, then the language code in quotation marks.
## Creating a New Translation
-Follow these steps to create a new translation. You will need a GitHub account to do this:
-1. Determine the language code of your language, using [this list](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes). For these instructions, I will be using the fictional code `xx` - replace that code with the code of whatever language you are translating to.
+Follow these steps to create a new translation. You will need a GitHub account to do this:
+
+1. Determine the language code of your language, using [this list](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes). For these instructions, I will be using the fictional code `xx` - replace that code with the code of whatever language you are translating to.
2. Go to the `src` folder, then the `locales` folder, then create a file `xx.json` inside that folder using either a text editor (e.g. Notepad), or GitHub.
-![Creating a new translation in GitHub](./img/create_locale_github.png)
+ ![Creating a new translation in GitHub](./img/create_locale_github.png)
3. Copy the text from `en.json` into this new file.
-4. Translate all of the pieces of text on the right. **Do not translate or alter in any way the pieces of text on the left!**
-![Translating in GitHub](./img/translate_github.png)
+4. Translate all of the pieces of text on the right. **Do not translate or alter in any way the pieces of text on the left!**
+ ![Translating in GitHub](./img/translate_github.png)
5. Scroll down and use the green button to commit the file.
6. Go to the `src` folder again, then `lib`, then `i18n.js`.
7. Use the pencil icon on the top-right to edit the file, then add your language code (**in quotation marks**) to the list.
-![Adding a new translation in GitHub](./img/add_locale_github.png)
+ ![Adding a new translation in GitHub](./img/add_locale_github.png)
8. Commit your changes like you did in step 5.
## Adding to an Existing Translation
-Follow these steps to add to an existing translation. You will also need a GitHub account to do this:
-1. Determine the language code of your language, using [this list](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes). For these instructions, I will be using the fictional code `xx` - replace that code with the code of whatever language you are translating to.
+Follow these steps to add to an existing translation. You will also need a GitHub account to do this:
+
+1. Determine the language code of your language, using [this list](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes). For these instructions, I will be using the fictional code `xx` - replace that code with the code of whatever language you are translating to.
2. Go to the `src` folder, then `locales`, then `en.json`.
3. Find the line with the piece of text that you want to translate.
4. Find your translation's file, at `src/locales/xx.json`.
5. Use the pencil icon on the top-right to edit the file.
-6. Add the whole line (both left and right parts) from step 3 to this file, in between the `{}` braces. Make sure the previous line has a comma at the end.
-7. Translate the piece of text on the right, keeping the quotes surrounding it. **Do not translate or alter in any way the piece of text on the left!**
+6. Add the whole line (both left and right parts) from step 3 to this file, in between the `{}` braces. Make sure the previous line has a comma at the end.
+7. Translate the piece of text on the right, keeping the quotes surrounding it. **Do not translate or alter in any way the piece of text on the left!**
8. Repeat steps 3-7 for every piece of text you want to translate (you should probably open `en.json` in another tab, so that your changes from step 6 aren't erased).
9. Scroll down and use the green button to commit the file.
diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte
index 544e2a9d..b6519ca9 100644
--- a/src/components/LandingHeader.svelte
+++ b/src/components/LandingHeader.svelte
@@ -3,7 +3,7 @@
import { scroll } from '$lib/utils';
import { Icon, LocaleSelector } from '$comp';
import { user } from '$lib/store';
- import { _ } from 'svelte-i18n';
+ import { _ } from 'svelte-i18n';
export let howItWorks;
export let faq;
@@ -18,17 +18,15 @@
<header class="w-full lg:w-5/6 py-5 mx-auto fixed md:sticky z-10 top-0 bg-white/90">
<nav class="block xl:flex flex-wrap justify-between items-center">
-<div class='flex justify-start md:justify-center items-center md:space-x-10'>
- <a href="/" class="hidden md:block">
- <Icon icon="logo" style="mb-5 xl:mb-0" />
- </a>
- <Icon icon="logo" style="block md:hidden ml-5 w-48" />
-<LocaleSelector style='hidden md:block py-1 mb-5 xl:mb-0' />
-</div>
+ <div class="flex justify-start md:justify-center items-center md:space-x-10">
+ <a href="/" class="hidden md:block">
+ <Icon icon="logo" style="mb-5 xl:mb-0" />
+ </a>
+ <Icon icon="logo" style="block md:hidden ml-5 w-48" />
+ <LocaleSelector style="hidden md:block py-1 mb-5 xl:mb-0" />
+ </div>
<!-- desktop nav -->
<div class="hidden space-x-10 md:flex flex-wrap justify-center items-center font-bold">
-
-
<button on:click={() => scroll(howItWorks)}>{$_('nav.howItWorks')}</button>
<button on:click={() => scroll(faq)}>{$_('nav.faq')}</button>
<button on:click={() => scroll(about)}>{$_('nav.about')}</button>
@@ -55,7 +53,6 @@
Sign out
</button>
{/if}
-
</div>
<!-- mobile nav -->
@@ -71,13 +68,13 @@
: 'right-[-100%]'} transition-all ease-in-out duration-300 h-[100vh] w-full bg-white"
>
<div class="space-y-8 mt-24 ml-10 font-bold text-xl">
-
-
<button on:click={() => mobileMenuButtonClick(howItWorks)} class="block"
>{$_('nav.howItWorks')}</button
>
<button on:click={() => mobileMenuButtonClick(faq)} class="block">{$_('nav.faq')}</button>
- <button on:click={() => mobileMenuButtonClick(about)} class="block">{$_('nav.about')}</button>
+ <button on:click={() => mobileMenuButtonClick(about)} class="block"
+ >{$_('nav.about')}</button
+ >
{#if !$user}
<button
class="border rounded-full px-6 py-2 font-bold block"
@@ -88,7 +85,7 @@
class="bg-black text-white border rounded-full px-6 py-2 font-bold block"
on:click={() => goto('/login')}
>
- {$_('nav.signIn')}
+ {$_('nav.signIn')}
</button>
{:else}
<button
@@ -104,7 +101,7 @@
</button>
{/if}
- <LocaleSelector style='py-1' />
+ <LocaleSelector style="py-1" />
</div>
</div>
</nav>
diff --git a/src/components/LocaleSelector.svelte b/src/components/LocaleSelector.svelte
index 3f173109..2ae65986 100644
--- a/src/components/LocaleSelector.svelte
+++ b/src/components/LocaleSelector.svelte
@@ -1,10 +1,10 @@
<script>
- import { _, locale, locales } from 'svelte-i18n';
- export let style
+ import { _, locale, locales } from 'svelte-i18n';
+ export let style;
</script>
-<select name='language' bind:value={$locale} class={style}>
- {#each $locales as locale}
- <option value={locale}>{locale}</option>
- {/each}
+<select name="language" bind:value={$locale} class={style}>
+ {#each $locales as locale}
+ <option value={locale}>{locale}</option>
+ {/each}
</select>
diff --git a/src/lib/i18n.js b/src/lib/i18n.js
index fdf5de3c..3105c709 100644
--- a/src/lib/i18n.js
+++ b/src/lib/i18n.js
@@ -2,41 +2,40 @@ import { register, init, getLocaleFromNavigator } from 'svelte-i18n';
// The list of locales to look for
// ADD ALL NEW LANGUAGE CODES TO THIS LIST
-const localeCodes = ["en", "fr"];
+const localeCodes = ['en', 'fr'];
// the default locale to use if none was found
-const defaultLocale = "en";
+const defaultLocale = 'en';
// Adds a new locale based on its code
function addLocale(localeCode) {
- register(localeCode, () => import(`../locales/${localeCode}.json`));
+ register(localeCode, () => import(`../locales/${localeCode}.json`));
}
// Picks the default locale based on navigator locale and the list of available locales
function pickLocale(navigatorLocale, availableLocales) {
- // locale can be null the first time you load this
- // return the default locale in that case - reloading should fix this
- if (!navigatorLocale)
- return defaultLocale;
+ // locale can be null the first time you load this
+ // return the default locale in that case - reloading should fix this
+ if (!navigatorLocale) return defaultLocale;
- // determine langugage part of locale
- // (e.g. if navigatorLocale is 'en-US', languageCode is 'en')
- let dashIndex = navigatorLocale ? navigatorLocale.indexOf("-") : -1;
- let languageCode; // navigator locale without the regional part
- if (dashIndex === -1) {
- languageCode = navigatorLocale;
- } else {
- languageCode = navigatorLocale.slice(0, dashIndex);
- }
+ // determine langugage part of locale
+ // (e.g. if navigatorLocale is 'en-US', languageCode is 'en')
+ let dashIndex = navigatorLocale ? navigatorLocale.indexOf('-') : -1;
+ let languageCode; // navigator locale without the regional part
+ if (dashIndex === -1) {
+ languageCode = navigatorLocale;
+ } else {
+ languageCode = navigatorLocale.slice(0, dashIndex);
+ }
- // get locale
- if (availableLocales.includes(navigatorLocale)) {
- return navigatorLocale;
- } else if (availableLocales.includes(languageCode)) {
- return languageCode;
- } else {
- return navigatorLocale;
- }
+ // get locale
+ if (availableLocales.includes(navigatorLocale)) {
+ return navigatorLocale;
+ } else if (availableLocales.includes(languageCode)) {
+ return languageCode;
+ } else {
+ return navigatorLocale;
+ }
}
// add locales
@@ -44,6 +43,6 @@ localeCodes.forEach(addLocale);
let initialLocale = pickLocale(getLocaleFromNavigator(), localeCodes);
init({
- fallbackLocale: defaultLocale,
- initialLocale: initialLocale,
+ fallbackLocale: defaultLocale,
+ initialLocale: initialLocale
});
diff --git a/src/locales/en.json b/src/locales/en.json
index c5c36c4b..a44c202f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,11 +1,10 @@
{
- "langname": "English",
- "nav": {
- "howItWorks": "How It Works",
- "faq": "FAQ",
- "about": "About",
- "startInSeconds": "Start in Seconds",
- "signIn": "Sign In"
-}
-
+ "langname": "English",
+ "nav": {
+ "howItWorks": "How It Works",
+ "faq": "FAQ",
+ "about": "About",
+ "startInSeconds": "Start in Seconds",
+ "signIn": "Sign In"
+ }
}
diff --git a/src/locales/fr.json b/src/locales/fr.json
index d2c9d758..9adc9488 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -1,11 +1,10 @@
{
- "langname": "Français",
-"nav": {
- "howItWorks": "Comment Ça Fonctionne",
- "faq": "FAQ",
- "about": "À Propos",
- "startInSeconds": "Commence en Secondes",
- "signIn": "Connexion"
-}
-
+ "langname": "Français",
+ "nav": {
+ "howItWorks": "Comment Ça Fonctionne",
+ "faq": "FAQ",
+ "about": "À Propos",
+ "startInSeconds": "Commence en Secondes",
+ "signIn": "Connexion"
+ }
}
diff --git a/src/routes/[username]/settings.svelte b/src/routes/[username]/settings.svelte
index 11e0977a..e4d7b0bf 100644
--- a/src/routes/[username]/settings.svelte
+++ b/src/routes/[username]/settings.svelte
@@ -44,10 +44,10 @@
</div>
{#if setting === 'account'}
- <div>
- <label for="language" class="font-bold block mb-1">Language</label>
- <LocaleSelector style='block py-3 w-full'/>
- </div>
+ <div>
+ <label for="language" class="font-bold block mb-1">Language</label>
+ <LocaleSelector style="block py-3 w-full" />
+ </div>
<div>
<label for="username" class="font-bold mb-1 block">Username</label>
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index c5234c7d..5f9f1456 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -1,16 +1,16 @@
<script context="module">
- import { waitLocale } from 'svelte-i18n'
+ import { waitLocale } from 'svelte-i18n';
- export async function preload() {
- // awaits for the loading of the 'en-US' and 'en' dictionaries
- return waitLocale()
- }
+ export async function preload() {
+ // awaits for the loading of the 'en-US' and 'en' dictionaries
+ return waitLocale();
+ }
</script>
<script>
import { SvelteToast } from '@zerodevx/svelte-toast';
import '../app.css';
- import '$lib/i18n';
+ import '$lib/i18n';
import { onMount } from 'svelte';
import { connect } from '$lib/socket';
import { user, token } from '$lib/store';