Skip to content

Commit 972b829

Browse files
committed
Merge branch 'dn2_further'
2 parents 6c495cb + 765dadb commit 972b829

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

frontend/src/About.svelte

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,18 @@
100100
<h1>{$_("words.About")} {$app.Title}</h1>
101101
<p><T id="aboutPage.toolbarDescription" url="https://toys-arr.us"/></p>
102102
<Col md="6">
103-
<h3>{$_("words.Development")} </h3>
103+
<h3>{$_("words.Development")}</h3>
104104
<Table dark={$conf.Dark} responsive>
105105
<tr>
106-
<td style="width:180px;"><a-link url="https://github.com/Notifiarr/toolbarr"><Fa icon={faGithub} /> {$app.Title} GitHub</a-link></td>
106+
<td style="width:180px;"><open-browser href="https://github.com/Notifiarr/toolbarr"><Fa icon={faGithub} /> {$app.Title} GitHub</open-browser></td>
107107
<td>{$_("aboutPage.Visitthesausagefactory")}</td>
108108
</tr>
109109
<tr>
110-
<td><a-link url="https://notifiarr.com/discord"><Fa fw icon={faDiscord} /> Notifiarr Discord</a-link></td>
110+
<td><open-browser href="https://notifiarr.com/discord"><Fa fw icon={faDiscord} /> Notifiarr Discord</open-browser></td>
111111
<td>{$_("aboutPage.Foryournotificationsneeds")}</td>
112112
</tr>
113113
<tr>
114-
<td><a-link url="https://golift.io/discord"><Fa fw icon={faDiscord} /> Go Lift Discord</a-link></td>
114+
<td><open-browser href="https://golift.io/discord"><Fa fw icon={faDiscord} /> Go Lift Discord</open-browser></td>
115115
<td>{$_("aboutPage.Codecookincollaborators")}</td>
116116
</tr>
117117
</Table>

frontend/src/libs/Link.svelte

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<svelte:options tag="a-link"/>
1+
<svelte:options tag="open-browser"/>
22

33
<!-- This allows us to open an external link in a browser. -->
44
<script type="ts">
55
import { BrowserOpenURL } from "../../wailsjs/runtime/runtime"
6-
export let url
7-
const openUrl = (e) => { e.preventDefault(); BrowserOpenURL(url) }
6+
export let href
7+
const openUrl = (e) => { e.preventDefault(); BrowserOpenURL(href) }
88
</script>
99

10-
<a href="#top" on:click={openUrl}><slot></slot></a>
10+
<a href="#top" {...$$props} on:click={openUrl}><slot></slot></a>

frontend/src/libs/Translate.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
</script>
1313

1414
{#if $isReady == true}
15-
{@html $_(id,{values:{...$$props}})}
15+
{@html $_(id,{values:{...$$props}}).replaceAll(/<([/]?)a([ >])/ig,"<$1open-browser$2") }
1616
{/if}

frontend/src/libs/locale/en.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"theStarroftheshow": "The Starr of the show.",
77
"OtherTools": "Other Tools",
88
"TranslationInformation": "Translation Information",
9-
"LanguageHelpText": "While this application supports many languages, there are not many translations available. If you can translate text, please help us out at <a-link url=\"{url}\">Notifiarr Translations</a-link>.",
9+
"LanguageHelpText": "While this application supports many languages, there are not many translations available. If you can translate text, please help us out at <a href=\"{url}\">Notifiarr Translations</a>.",
1010
"words": {
1111
"ERROR": "ERROR",
1212
"CONFIG": "CONFIG",
@@ -103,9 +103,9 @@
103103
"Visitthesausagefactory": "Visit the sausage factory.",
104104
"Foryournotificationsneeds": "For your notifications needs.",
105105
"Codecookincollaborators": "Code cookin' collaborators.",
106-
"toolbarDescription": "Toolbarr fixes problems with Starr apps. It comes with a five starr rating from <a-link url=\"{url}\">Toys Arr Us</a-link>.",
107-
"CreatedbyGoLift": "Created by <a-link url=\"{goLiftURL}\">Go Lift</a-link> for <a-link url=\"{notifiarrURL}\">Notifiarr</a-link>.",
108-
"Backgroundbyrawpixel": "Backgrounds by <a-link url=\"{rawPixelURL}\">rawpixel.com</a-link> on <a-link url=\"{freepikURL}\">Freepik</a-link>.",
109-
"WritteninSvelte": "Written in <a-link url=\"{svelteURL}\">Svelte</a-link> using <a-link url=\"{wailsURL}\">Wails</a-link>."
106+
"toolbarDescription": "Toolbarr fixes problems with Starr apps. It comes with a five starr rating from <a href=\"{url}\">Toys Arr Us</a>.",
107+
"CreatedbyGoLift": "Created by <a href=\"{goLiftURL}\">Go Lift</a> for <a href=\"{notifiarrURL}\">Notifiarr</a>.",
108+
"Backgroundbyrawpixel": "Backgrounds by <a href=\"{rawPixelURL}\">rawpixel.com</a> on <a href=\"{freepikURL}\">Freepik</a>.",
109+
"WritteninSvelte": "Written in <a href=\"{svelteURL}\">Svelte</a> using <a href=\"{wailsURL}\">Wails</a>."
110110
}
111111
}

0 commit comments

Comments
 (0)