Merge 'ppy/master' into Pennek/glossary-l

ppy · Sep 3, 2020 · 6774491 · 6774491
2 parents 16d77ca + 3291a19
commit 6774491
Show file tree

Hide file tree

Showing 905 changed files with 11,192 additions and 4,706 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -1,6 +1,9 @@
 name: osu-wiki continuous integration
 
 on:
+  push:
+    branches:
+      - master
   pull_request:
     branches:
       - master
@@ -70,8 +73,9 @@ jobs:
         run: npm install
 
       - name: run remark on changed files
+        # xargs is ran with -d '\n' to properly handle single and double quotes
         # stdout is discarded (remark prints files being checked there)
-        run: git diff --diff-filter=d --name-only ${{ github.sha }}^ ${{ github.sha }} '*.md' | xargs npx remark -qf --no-stdout --silently-ignore --report=vfile-reporter-position --color
+        run: git diff --diff-filter=d --name-only ${{ github.sha }}^ ${{ github.sha }} '*.md' | xargs -d '\n' npx remark -qf --no-stdout --silently-ignore --report=vfile-reporter-position --color
 
       - name: run yamllint on all yaml files
         uses: ibiqlik/[email protected]

diff --git a/meta/flag-references/th.md b/meta/flag-references/th.md
diff --git a/meta/flag-references/zh.md b/meta/flag-references/zh.md
@@ -190,7 +190,7 @@
 [flag_SD]: /wiki/shared/flag/SD.gif "苏丹"
 [flag_SE]: /wiki/shared/flag/SE.gif "瑞典"
 [flag_SG]: /wiki/shared/flag/SG.gif "新加坡"
-[flag_SH]: /wiki/shared/flag/SH.gif "圣赫勒拿"
+[flag_SH]: /wiki/shared/flag/SH.gif "圣海伦娜"
 [flag_SI]: /wiki/shared/flag/SI.gif "斯洛文尼亚"
 [flag_SJ]: /wiki/shared/flag/SJ.gif "斯瓦尔巴和扬马延"
 [flag_SK]: /wiki/shared/flag/SK.gif "斯洛伐克"

diff --git a/meta/group-info/en.yaml b/meta/group-info/en.yaml
@@ -50,9 +50,11 @@ languages:
   nl: Dutch
   pl: Polish
   pt: Portuguese
+  ro: Romanian
   ru: Russian
   sr: Serbian
   sv: Swedish
+  te: Telugu
   th: Thai
   tr: Turkish
   ur: Urdu

diff --git a/meta/group-info/pt-br.yaml b/meta/group-info/pt-br.yaml
@@ -1,4 +1,4 @@
-outdated: true # missing alumni.roles.tournaments, languages.ur, languages.vi, languages.hr, languages.bn
+outdated: true # missing alumni.roles.tournaments, languages.ur, languages.vi, languages.hr, languages.bn, languages.te
 separator: ", "
 alumni:
   roles:

diff --git a/meta/group-info/tr.yaml b/meta/group-info/tr.yaml
@@ -50,9 +50,11 @@ languages:
   nl: Flemenkçe
   pl: Lehçe
   pt: Portekizce
+  ro: Romence
   ru: Rusça
   sr: Sırpça
   sv: İsveççe
+  te: Teluguca
   th: Tay dili
   tr: Türkçe
   ur: Urduca

diff --git a/meta/group-info/zh.yaml b/meta/group-info/zh.yaml
@@ -50,9 +50,11 @@ languages:
   nl: 荷兰语
   pl: 波兰语
   pt: 葡萄牙语
+  ro: 罗马尼亚语
   ru: 俄语
   sr: 塞尔维亚语
   sv: 瑞典语
+  te: 泰卢固语
   th: 泰语
   tr: 土耳其语
   ur: 乌尔都语