Skip to content

Commit

Permalink
v1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
050644zf committed Aug 11, 2024
1 parent c04d278 commit c303796
Show file tree
Hide file tree
Showing 34 changed files with 220 additions and 147 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ jobs:
VITE_BASE: /ArknightsStoryTextReader/

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- uses: actions/checkout@v2
with:
repository: 050644zf/ArknightsStoryTextReader
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "reader/src/ASTRv2/astr-i18n"]
path = reader/src/ASTRv2/astr-i18n
url = https://github.com/050644zf/astr-i18n
106 changes: 100 additions & 6 deletions reader/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions reader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"lodash": "^4.17.21",
"vue": "^3.2.16",
"vue-echarts": "^6.7.3",
"vue-i18n": "^9.13.1",
"vue-meta": "^3.0.0-alpha.10",
"vue-router": "^4.0.12",
"xlsx": "^0.17.5"
Expand Down
1 change: 1 addition & 0 deletions reader/src/ASTRv2/astr-i18n
Submodule astr-i18n added at 4d39c9
8 changes: 3 additions & 5 deletions reader/src/ASTRv2/components/opcard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</template>

<n-tabs type="line" animated>
<n-tab-pane name="archive" :tab="i18n.archive[currentLang]">
<n-tab-pane name="archive" :tab="$t('opcard.archive')">
<n-scrollbar style="max-height: 70vh">
<div v-for="(aline, aidx) in cdata.storyTextAudio" :key="aidx">
<n-divider>{{ aline.storyTitle }}</n-divider>
Expand All @@ -41,7 +41,7 @@
:value="cdata.equips.length"
:offset="[6, 0]"
class="font"
>{{ i18n.module[currentLang] }}</n-badge
>{{ $t('opcard.module') }}</n-badge
>
</template>
<n-collapse accordion :default-expanded-names="[0]">
Expand Down Expand Up @@ -82,7 +82,7 @@
:value="cdata.handbookAvgList.length"
:offset="[6, 0]"
class="font"
>{{ i18n.or[currentLang] }}</n-badge
>{{ $t('opcard.or') }}</n-badge
>
</template>
<div v-for="(recs, ridx) in cdata.handbookAvgList" :key="ridx">
Expand Down Expand Up @@ -118,14 +118,12 @@
import func from "../func.js";
import source from "../source.js";
import { ArrowForwardOutlined } from "@vicons/material";
import i18n from "../i18n.json";
export default {
props: ["cdata"],
data() {
return {
parseContent: func.parseContent,
currentLang: func.l,
i18n: i18n,
};
},
computed: {
Expand Down
4 changes: 1 addition & 3 deletions reader/src/ASTRv2/components/openInGTL.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@
<template #icon>
<TranslateIcon />
</template>
{{ i18n.openInGoogleTL[UILang] }}
{{ $t('header.openInGoogleTL') }}
</n-button>
</template>

<script>
import i18n from "../i18n.json";
import func from "../func.js";
import { TranslateOutlined } from "@vicons/material";
export default {
data() {
return {
i18n: i18n,
currentLang: this.$route.params.server,
UILang: func.l,
};
Expand Down
6 changes: 1 addition & 5 deletions reader/src/ASTRv2/components/openInNewBtn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,17 @@
</template>
</n-button>
</template>
{{ i18n.openInNew[currentLang] }}
{{ $t('eventpage.openInNew') }}
</n-tooltip>
</template>

<script>
import i18n from "../i18n.json";
import func from "../func.js";
import { OpenInNewOutlined } from "@vicons/material";
export default {
props: ["link"],
data() {
return {
i18n: i18n,
server: this.$route.params.server,
currentLang: func.l,
};
},
methods: {
Expand Down
5 changes: 1 addition & 4 deletions reader/src/ASTRv2/content/link.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,19 @@
</n-icon>
</n-icon-wrapper>
</template>
{{ i18n["copied"][currentLang] }}
{{ $t("contentpage.copied") }}
</n-popover>
</template>

<script>
import func from "../func";
import i18n from "../i18n";
import { LinkOutlined } from "@vicons/material";
export default {
data() {
return {
line: this.inputline,
hideName: func.hideName,
i18n: i18n,
currentLang: func.l,
copied: false,
};
},
Expand Down
4 changes: 1 addition & 3 deletions reader/src/ASTRv2/content/nameline.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,13 @@
</n-icon>
</n-icon-wrapper>
</template>
{{ i18n["copied"][currentLang] }}
{{ $t("contentpage.copied") }}
</n-popover>
</div>
</template>

<script>
import func from "../func";
import i18n from "../i18n";
import { LinkOutlined } from "@vicons/material";
export default {
Expand All @@ -42,7 +41,6 @@ export default {
line: this.inputline,
hideName: func.hideName,
showLink: false,
i18n: i18n,
currentLang: func.l,
copied: false,
};
Expand Down
3 changes: 1 addition & 2 deletions reader/src/ASTRv2/content/subtitle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@
</n-icon>
</n-icon-wrapper>
</template>
{{ i18n["copied"][currentLang] }}
{{ $t("contentpage.copied") }}
</n-popover>
<div v-html="parseContent(line.attributes.text)"></div>
</div>
</template>

<script>
import func from "../func";
import i18n from "../i18n";
import { LinkOutlined } from "@vicons/material";
export default {
Expand Down
9 changes: 3 additions & 6 deletions reader/src/ASTRv2/contentpage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
role="link"
>
<n-icon><MenuIcon /></n-icon>
{{ i18n.menu[currentLang] }}
{{ $t('eventpage.menu') }}
</n-breadcrumb-item>
<n-breadcrumb-item
@click="
Expand All @@ -32,7 +32,7 @@
v-else
role="link"
>
{{ i18n.extra[currentLang] }}
{{ $t('contentpage.extra') }}
</n-breadcrumb-item>
<br class="breadcrumbbreak" />
<n-breadcrumb-item role="button">
Expand Down Expand Up @@ -76,7 +76,7 @@

<n-space veritical class="content" justify="center" warp="false">
<!-- <n-h4 prefix="bar" type="warning" v-if="!data.OPTIONTRACE && !loading">
{{i18n.optionTraceDisabled[currentLang]}}
{{$t('contentpage.optionTraceDisabled')}}
</n-h4> -->
<n-skeleton v-if="loading" :repeat="5"></n-skeleton>
<div v-else class="lines">
Expand Down Expand Up @@ -152,7 +152,6 @@
<script>
import menuVue from "./menu.vue";
import func from "./func.js";
import i18n from "./i18n.json";
import nameline from "./content/nameline.vue";
import subtitle from "./content/subtitle.vue";
import decision from "./content/decision.vue";
Expand All @@ -179,8 +178,6 @@ export default {
data: {},
eventid: "",
server: this.$route.params.server,
i18n: i18n,
currentLang: func.l,
showDelay: func.showDelay,
bgMode: func.bgMode,
fontsize: func.fontsize,
Expand Down
Loading

0 comments on commit c303796

Please sign in to comment.