Merge branch 'main' of https://github.com/ciderapp/Cider
This commit is contained in:
commit
43c00f20ac
9 changed files with 15 additions and 2 deletions
BIN
resources/icons/icon-old.icns
Normal file
BIN
resources/icons/icon-old.icns
Normal file
Binary file not shown.
Binary file not shown.
|
@ -54,8 +54,18 @@ export class utils {
|
||||||
|
|
||||||
if (language !== "en_US" && fs.existsSync(path.join(this.paths.i18nPath, `${language}.json`))) {
|
if (language !== "en_US" && fs.existsSync(path.join(this.paths.i18nPath, `${language}.json`))) {
|
||||||
i18n = Object.assign(i18n, JSON.parse(fs.readFileSync(path.join(this.paths.i18nPath, `${language}.json`), "utf8")));
|
i18n = Object.assign(i18n, JSON.parse(fs.readFileSync(path.join(this.paths.i18nPath, `${language}.json`), "utf8")));
|
||||||
|
} else if (!fs.existsSync(path.join(this.paths.i18nPath, `${language}.json`))) {
|
||||||
|
fetch(`https://raw.githubusercontent.com/ciderapp/Cider/main/src/i18n/${language}.json`)
|
||||||
|
.then(res => res.json())
|
||||||
|
.then(res => {
|
||||||
|
if (res) {
|
||||||
|
i18n = Object.assign(i18n, res);
|
||||||
|
fs.writeFileSync(path.join(this.paths.i18nPath, `${language}.json`), JSON.stringify(res));
|
||||||
|
} else {
|
||||||
|
i18n = Object.assign(i18n, JSON.parse(fs.readFileSync(path.join(this.paths.i18nPath, `en_US.json`), "utf8")));
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
if (key) {
|
if (key) {
|
||||||
return i18n[key]
|
return i18n[key]
|
||||||
} else {
|
} else {
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1251,9 +1251,10 @@
|
||||||
</div>
|
</div>
|
||||||
</b-tab>
|
</b-tab>
|
||||||
<!-- Connect Settings -->
|
<!-- Connect Settings -->
|
||||||
|
<!-- Not Prod Ready
|
||||||
<b-tab :title="$root.getLz('settings.header.connect')">
|
<b-tab :title="$root.getLz('settings.header.connect')">
|
||||||
<div class="md-option-container">
|
<div class="md-option-container">
|
||||||
<!-- Cider Connect / Linking Settings -->
|
<!!!!!-- Cider Connect / Linking Settings -!->
|
||||||
<div class="md-option-header">
|
<div class="md-option-header">
|
||||||
<span>{{$root.getLz('settings.header.connect')}}</span>
|
<span>{{$root.getLz('settings.header.connect')}}</span>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1335,6 +1336,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</b-tab>
|
</b-tab>
|
||||||
|
-->
|
||||||
</b-tabs>
|
</b-tabs>
|
||||||
</div>
|
</div>
|
||||||
</script>
|
</script>
|
||||||
|
|
1
src/renderer/views/svg/external-link.svg
Normal file
1
src/renderer/views/svg/external-link.svg
Normal file
|
@ -0,0 +1 @@
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
|
After Width: | Height: | Size: 388 B |
Loading…
Add table
Add a link
Reference in a new issue