Skip to content

Commit 593243e

Browse files
committed
Merge branch 'refactorsCode' into 'main'
Refactors vue code See merge request softwares-pkp/plugins_ojs/doiscielo!40
2 parents 356984e + 397d174 commit 593243e

5 files changed

Lines changed: 26 additions & 14 deletions

File tree

i18nExtractKeys.vite.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ function extractRegexPlugin({ extraKeys } = {}) {
4242
// remove dummy key used in the comment examples
4343
uniqueKeys.delete("key");
4444

45+
// remove keys with unresolved template literals
46+
for (const key of uniqueKeys) {
47+
if (key.includes("${")) {
48+
uniqueKeys.delete(key);
49+
}
50+
}
51+
4552
if (uniqueKeys.size) {
4653
const dir = path.dirname(fileOutput);
4754

public/build/build.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/build.iife.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/js/components/ScreeningInfo.vue

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,12 @@
116116
screeningData.statusDocumentOrcids
117117
)"
118118
></span>
119-
<span v-if="screeningData.statusDocumentOrcids === 'Okay'">
120-
{{ t("plugins.generic.scieloScreening.info.documentOrcidsOkay") }}
121-
</span>
122-
<span v-else-if="screeningData.statusDocumentOrcids === 'UnableNoFile'">
123-
{{ t("plugins.generic.scieloScreening.info.documentOrcidsUnableNoFile") }}
124-
</span>
125-
<span v-else-if="screeningData.statusDocumentOrcids === 'UnableNoOrcids'">
126-
{{ t("plugins.generic.scieloScreening.info.documentOrcidsUnableNoOrcids") }}
127-
</span>
128-
<span v-else-if="screeningData.statusDocumentOrcids === 'UnableException'">
129-
{{ t("plugins.generic.scieloScreening.info.documentOrcidsUnableException") }}
119+
<span v-if="screeningData.statusDocumentOrcids !== 'NotOkay'">
120+
{{
121+
t(
122+
`plugins.generic.scieloScreening.info.documentOrcids${screeningData.statusDocumentOrcids}`
123+
)
124+
}}
130125
</span>
131126
<span v-else>
132127
{{

vite.config.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,17 @@ import vue from "@vitejs/plugin-vue";
44
import i18nExtractKeys from "./i18nExtractKeys.vite.js";
55

66
export default defineConfig({
7-
plugins: [i18nExtractKeys(), vue()],
7+
plugins: [
8+
i18nExtractKeys({
9+
extraKeys: [
10+
"plugins.generic.scieloScreening.info.documentOrcidsOkay",
11+
"plugins.generic.scieloScreening.info.documentOrcidsUnableNoFile",
12+
"plugins.generic.scieloScreening.info.documentOrcidsUnableNoOrcids",
13+
"plugins.generic.scieloScreening.info.documentOrcidsUnableException",
14+
],
15+
}),
16+
vue(),
17+
],
818
build: {
919
target: "es2016",
1020
lib: {

0 commit comments

Comments
 (0)