Compare incoming & our changes for previous merge commit

apps/app-frontend/src/components/ui/AddContentButton.vue

@@ -6,6 +6,10 @@ import { add_project_from_path, get } from '@/helpers/profile.js'
 import { handleError } from '@/store/notifications.js'
 import { useRouter } from 'vue-router'
 
+import { i18n } from '@/main.js'
+
+const t = i18n.global.t
+
 const props = defineProps({
   instance: {
     type: Object,
@@ -35,7 +39,9 @@ const handleSearchContent = async () => {
 
 <template>
   <div class="joined-buttons">
-    <Button color="primary" @click="handleSearchContent"><SearchIcon /> Add content </Button>
+    <Button color="primary" @click="handleSearchContent"
+      ><SearchIcon /> {{ t('Instance.Mods.AddContent') }}
+    </Button>
 
     <OverflowMenu
       :options="[
@@ -53,11 +59,11 @@ const handleSearchContent = async () => {
       <DropdownIcon />
       <template #search>
         <SearchIcon />
-        <span class="no-wrap"> Search </span>
+        <span class="no-wrap"> {{t('Instance.Mods.Search')}} </span>
       </template>
       <template #from_file>
         <FolderOpenIcon />
-        <span class="no-wrap"> Add from file </span>
+        <span class="no-wrap"> {{ t('Instance.Mods.AddFile') }} </span>
       </template>
     </OverflowMenu>
   </div>

apps/app/tauri.conf.json

@@ -78,7 +78,7 @@
       }
     },
     "security": {
-      "csp": "default-src 'self'; connect-src https://api.github.com https://modrinth.com https://*.modrinth.com https://mixpanel.com https://*.mixpanel.com https://*.cloudflare.com https://api.mclo.gs; font-src https://cdn-raw.modrinth.com/fonts/inter/; img-src tauri: https: data: blob: asset: https://asset.localhost; script-src https://*.cloudflare.com 'self' 'unsafe-eval' 'sha256-qI6/iDpFRcrQvD88dpuloNxSy8DwdlZzYyHGlvNwjYU=' 'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='; frame-src https://*.cloudflare.com https://www.youtube.com 'self'; style-src 'self' 'unsafe-inline';"
+      "csp": "default-src 'self'; connect-src https://api.github.com https://modrinth.com https://*.modrinth.com https://mixpanel.com https://*.mixpanel.com https://*.cloudflare.com https://api.mclo.gs; font-src https://cdn-raw.modrinth.com/fonts/inter/; img-src tauri: https: data: blob: asset: https://asset.localhost; script-src https://*.cloudflare.com 'self' 'unsafe-eval' 'sha256-qI6/iDpFRcrQvD88dpuloNxSy8DwdlZzYyHGlvNwjYU=' 'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='; frame-src https://*.cloudflare.com https://www.youtube.com 'self'; style-src 'self' ''unsafe-inline'';"
     },
     "updater": {
       "active": false

package.json

@@ -13,9 +13,9 @@
     "test": "turbo run test --continue"
   },
   "devDependencies": {
-    "prettier": "^3.3.2",
-    "turbo": "^2.0.6",
-    "vue": "^3.4.31"
+    "prettier": "^3.3.3",
+    "turbo": "^2.0.7",
+    "vue": "^3.4.32"
   },
   "packageManager": "[email protected]",
   "pnpm": {