btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

refactor: more i18n translation strings

Browse Source
This commit is contained in:
liyasthomas
2021-08-18 22:17:31 +05:30
parent b9c233cdf9
commit ceb8bdf0fd
54 changed files with 408 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pages/index.vue
View File

@@ -7,14 +7,14 @@
<SmartTabs styles="sticky top-upperPrimaryStickyFold z-10">
<SmartTab
:id="'params'"
:label="$t('parameters')"
:label="$t('tab.parameters')"
:selected="true"
:info="newActiveParamsCount$"
>
<HttpParameters />
</SmartTab>
<SmartTab :id="'bodyParams'" :label="$t('body')">
<SmartTab :id="'bodyParams'" :label="$t('tab.body')">
<HttpBody />
</SmartTab>
@@ -26,18 +26,18 @@
<HttpHeaders />
</SmartTab>
<SmartTab :id="'authorization'" :label="$t('authorization')">
<SmartTab :id="'authorization'" :label="$t('tab.authorization')">
<HttpAuthorization />
</SmartTab>
<SmartTab
:id="'preRequestScript'"
:label="$t('pre_request_script')"
:label="$t('tab.pre_request_script')"
>
<HttpPreRequestScript />
</SmartTab>
<SmartTab :id="'tests'" :label="$t('tests')">
<SmartTab :id="'tests'" :label="$t('tab.tests')">
<HttpTests />
</SmartTab>
</SmartTabs>
@@ -56,11 +56,11 @@
>
<aside>
<SmartTabs styles="sticky z-10 top-0">
<SmartTab :id="'history'" :label="$t('history')" :selected="true">
<SmartTab :id="'history'" :label="$t('tab.history')" :selected="true">
<History ref="historyComponent" :page="'rest'" />
</SmartTab>
<SmartTab :id="'collections'" :label="$t('collections')">
<SmartTab :id="'collections'" :label="$t('tab.collections')">
<Collections />
</SmartTab>
@@ -70,6 +70,12 @@
</SmartTabs>
</aside>
</Pane>
<SmartConfirmModal
:show="confirmSync"
:title="$t('confirm.sync')"
@hide-modal="confirmSync = false"
@resolve="syncRequest"
/>
</Splitpanes>
</template>
@@ -77,8 +83,10 @@
import {
computed,
defineComponent,
getCurrentInstance,
onBeforeUnmount,
onMounted,
ref,
useContext,
watch,
} from "@nuxtjs/composition-api"
@@ -105,6 +113,7 @@ import {
} from "~/helpers/utils/composables"
import { loadRequestFromSync, startRequestSync } from "~/helpers/fb/request"
import { onLoggedIn } from "~/helpers/fb/auth"
import { HoppRESTRequest } from "~/helpers/types/HoppRESTRequest"
function bindRequestToURLParams() {
const {
@@ -173,7 +182,12 @@ function setupRequestSync() {
onLoggedIn(async () => {
if (Object.keys(route.value.query).length === 0) {
const request = await loadRequestFromSync()
if (request) setRESTRequest(request)
if (request) {
console.log("sync le request nnd")
setRESTRequest(request)
// confirmSync.value = true
}
}
sub = startRequestSync()
@@ -188,6 +202,16 @@ function setupRequestSync() {
export default defineComponent({
components: { Splitpanes, Pane },
setup() {
const confirmSync = ref(false)
const internalInstance = getCurrentInstance()
console.log("yoo", internalInstance)
const syncRequest = (request: HoppRESTRequest) => {
console.log("syncinggg")
setRESTRequest(request)
}
const { subscribeToStream } = useStreamSubscriber()
setupRequestSync()
@@ -220,6 +244,8 @@ export default defineComponent({
PROXY_ENABLED: useSetting("PROXY_ENABLED"),
URL_EXCLUDES: useSetting("URL_EXCLUDES"),
EXPERIMENTAL_URL_BAR_ENABLED: useSetting("EXPERIMENTAL_URL_BAR_ENABLED"),
confirmSync,
syncRequest,
}
},
})

4
pages/realtime.vue
View File

@@ -13,14 +13,14 @@
</SmartTab>
<SmartTab
id="sse"
:label="$t('sse')"
:label="$t('tab.sse')"
style="height: calc(100% - var(--sidebar-primary-sticky-fold))"
>
<RealtimeSse />
</SmartTab>
<SmartTab
id="socketio"
:label="$t('socketio')"
:label="$t('tab.socketio')"
style="height: calc(100% - var(--sidebar-primary-sticky-fold))"
>
<RealtimeSocketio />

52
pages/settings.vue
View File

@@ -4,7 +4,7 @@
<div class="md:grid md:gap-4 md:grid-cols-3">
<div class="p-8 md:col-span-1">
<h3 class="heading">
{{ $t("account") }}
{{ $t("settings.account") }}
</h3>
<p class="mt-1 text-secondaryLight">
{{ $t("settings.account_description") }}
@@ -72,7 +72,7 @@
toggleSettings('syncCollections', !SYNC_COLLECTIONS)
"
>
{{ $t("syncCollections") }}
{{ $t("settings.sync_collections") }}
</SmartToggle>
</div>
<div class="flex items-center">
@@ -82,7 +82,7 @@
toggleSettings('syncEnvironments', !SYNC_ENVIRONMENTS)
"
>
{{ $t("syncEnvironments") }}
{{ $t("settings.sync_environments") }}
</SmartToggle>
</div>
<div class="flex items-center">
@@ -90,7 +90,7 @@
:on="SYNC_HISTORY"
@change="toggleSettings('syncHistory', !SYNC_HISTORY)"
>
{{ $t("syncHistory") }}
{{ $t("settings.sync_history") }}
</SmartToggle>
</div>
</div>
@@ -102,7 +102,7 @@
<div class="md:grid md:gap-4 md:grid-cols-3">
<div class="p-8 md:col-span-1">
<h3 class="heading">
{{ $t("theme") }}
{{ $t("settings.theme") }}
</h3>
<p class="mt-1 text-secondaryLight">
{{ $t("settings.theme_description") }}
@@ -111,7 +111,7 @@
<div class="space-y-8 p-8 md:col-span-2">
<section>
<h4 class="font-semibold text-secondaryDark">
{{ $t("background") }}
{{ $t("settings.background") }}
</h4>
<div class="mt-1 text-secondaryLight">
<ColorScheme placeholder="..." tag="span">
@@ -178,7 +178,11 @@
<div class="flex items-center">
<SmartToggle :on="TELEMETRY_ENABLED" @change="showConfirmModal">
{{ $t("settings.telemetry") }}
{{ TELEMETRY_ENABLED ? $t("enabled") : $t("disabled") }}
{{
TELEMETRY_ENABLED
? $t("state.enabled")
: $t("state.disabled")
}}
</SmartToggle>
</div>
<div class="flex items-center">
@@ -187,7 +191,11 @@
@change="toggleSetting('SHORTCUT_INDICATOR')"
>
{{ $t("settings.shortcuts_indicator") }}
{{ SHORTCUT_INDICATOR ? $t("enabled") : $t("disabled") }}
{{
SHORTCUT_INDICATOR
? $t("state.enabled")
: $t("state.disabled")
}}
</SmartToggle>
</div>
<div class="flex items-center">
@@ -196,13 +204,15 @@
@change="toggleSetting('LEFT_SIDEBAR')"
>
{{ $t("settings.navigation_sidebar") }}
{{ LEFT_SIDEBAR ? $t("enabled") : $t("disabled") }}
{{
LEFT_SIDEBAR ? $t("state.enabled") : $t("state.disabled")
}}
</SmartToggle>
</div>
<div class="flex items-center">
<SmartToggle :on="ZEN_MODE" @change="toggleSetting('ZEN_MODE')">
{{ $t("layout.zen_mode") }}
{{ ZEN_MODE ? $t("enabled") : $t("disabled") }}
{{ ZEN_MODE ? $t("state.enabled") : $t("state.disabled") }}
</SmartToggle>
</div>
</div>
@@ -222,19 +232,19 @@
<div class="space-y-8 p-8 md:col-span-2">
<section>
<h4 class="font-semibold text-secondaryDark">
{{ $t("extensions") }}
{{ $t("settings.extensions") }}
</h4>
<div class="mt-1 text-secondaryLight">
<span v-if="extensionVersion != null">
{{
`${$t("extension_version")}: v${extensionVersion.major}.${
extensionVersion.minor
}`
`${$t("settings.extension_version")}: v${
extensionVersion.major
}.${extensionVersion.minor}`
}}
</span>
<span v-else>
{{ $t("extension_version") }}:
{{ $t("extension_ver_not_reported") }}
{{ $t("settings.extension_version") }}:
{{ $t("settings.extension_ver_not_reported") }}
</span>
</div>
<div class="flex flex-col space-y-2 py-4">
@@ -267,17 +277,17 @@
:on="EXTENSIONS_ENABLED"
@change="toggleSetting('EXTENSIONS_ENABLED')"
>
{{ $t("extensions_use_toggle") }}
{{ $t("settings.extensions_use_toggle") }}
</SmartToggle>
</div>
</div>
</section>
<section>
<h4 class="font-semibold text-secondaryDark">
{{ $t("proxy") }}
{{ $t("settings.proxy") }}
</h4>
<div class="mt-1 text-secondaryLight">
{{ `${$t("official_proxy_hosting")} ${$t("read_the")}` }}
{{ `${$t("settings.official_proxy_hosting")} ${$t("read_the")}` }}
<SmartLink
class="link"
to="https://github.com/hoppscotch/proxyscotch/wiki/Privacy-policy"
@@ -292,7 +302,7 @@
:on="PROXY_ENABLED"
@change="toggleSetting('PROXY_ENABLED')"
>
{{ $t("proxy_use_toggle") }}
{{ $t("settings.proxy_use_toggle") }}
</SmartToggle>
</div>
</div>
@@ -307,7 +317,7 @@
:disabled="!PROXY_ENABLED"
/>
<label for="url">
{{ `${$t("proxy")} ${$t("url")}` }}
{{ $t("settings.proxy_url") }}
</label>
</div>
<ButtonSecondary