mirrors/hoppscotch
1
0
Fork 0
mirror of https://github.com/hoppscotch/hoppscotch synced 2024-11-21 22:50:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: merge hoppscotch/main into hoppscotch/next

Browse Source
This commit is contained in:
jamesgeorge007 2024-10-21 14:55:29 +05:30
commit cd1f7bb6b7
9 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/hoppscotch-backend/package.json
View File

@ -1,6 +1,6 @@
{
"name": "hoppscotch-backend",
"version": "2024.9.2",
"version": "2024.9.3",
"description": "",
"author": "",
"private": true,

2
packages/hoppscotch-common/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@hoppscotch/common",
"private": true,
"version": "2024.9.2",
"version": "2024.9.3",
"scripts": {
"dev": "pnpm exec npm-run-all -p -l dev:*",
"test": "vitest --run",

8
packages/hoppscotch-common/src/modules/i18n.ts
View File

@ -11,6 +11,8 @@ import { throwError } from "~/helpers/functional/error"
import { PersistenceService } from "~/services/persistence"
import { getService } from "./dioc"
import FALLBACK_LANG_MESSAGES from "../../locales/en.json"
/*
In context of this file, we have 2 main kinds of things.
1. Locale -> A locale is termed as the i18n entries present in the /locales folder
@ -144,6 +146,12 @@ export default <HoppModule>{
i18nInstance = i18n
// Load in fallback lang messages
i18nInstance.global.setLocaleMessage(
FALLBACK_LANG_CODE,
FALLBACK_LANG_MESSAGES
)
// TODO: Global loading state to hide the resolved lang loading
const currentLocale = resolveCurrentLocale()
changeAppLanguage(currentLocale)

2
packages/hoppscotch-selfhost-desktop/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@hoppscotch/selfhost-desktop",
"private": true,
"version": "2024.9.2",
"version": "2024.9.3",
"type": "module",
"scripts": {
"dev:vite": "vite",

2
packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lock generated
View File

@ -1383,7 +1383,7 @@ dependencies = [
[[package]]
name = "hoppscotch-desktop"
version = "24.9.2"
version = "24.9.3"
dependencies = [
"cocoa 0.25.0",
"dashmap",

2
packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "hoppscotch-desktop"
version = "24.9.2"
version = "24.9.3"
description = "A Tauri App"
authors = ["you"]
license = ""

2
packages/hoppscotch-selfhost-desktop/src-tauri/tauri.conf.json
View File

@ -8,7 +8,7 @@
},
"package": {
"productName": "Hoppscotch",
"version": "24.9.2"
"version": "24.9.3"
},
"tauri": {
"allowlist": {

2
packages/hoppscotch-selfhost-web/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@hoppscotch/selfhost-web",
"private": true,
"version": "2024.9.2",
"version": "2024.9.3",
"type": "module",
"scripts": {
"dev:vite": "vite",

2
packages/hoppscotch-sh-admin/package.json
View File

@ -1,7 +1,7 @@
{
"name": "hoppscotch-sh-admin",
"private": true,
"version": "2024.9.2",
"version": "2024.9.3",
"type": "module",
"scripts": {
"dev": "pnpm exec npm-run-all -p -l dev:*",