From b482cbf937056d68a34a2295ee5196ffb2658176 Mon Sep 17 00:00:00 2001 From: Estela Xu Date: Mon, 7 Mar 2022 15:14:39 +0800 Subject: [PATCH] optimise footer format and add Uyghurche (#389) --- .markdownlint.json | 2 +- .markdownlintignore | 2 + assets/sass/base/_typography.scss | 12 +++-- config/_default/languages.toml | 6 +++ config/_default/menus.ug.toml | 11 +++++ content/en/_index.md | 2 +- content/es/_index.md | 2 +- content/ug/_index.md | 47 ++++++++++++++++++ content/ug/about.md | 62 ++++++++++++++++++++++++ content/ug/docs/_index.md | 25 ++++++++++ content/ug/docs/campus/_index.md | 7 +++ content/ug/docs/campus/china/XJU.md | 43 ++++++++++++++++ content/ug/docs/friendship/index.md | 28 +++++++++++ content/ug/docs/medicine/_index.md | 5 ++ content/ug/docs/medicine/hrt-overview.md | 11 +++++ content/ug/docs/psyco/_index.md | 5 ++ content/zh-cn/_index.md | 2 +- content/zh-hant/_index.md | 2 +- 18 files changed, 265 insertions(+), 9 deletions(-) create mode 100644 config/_default/menus.ug.toml create mode 100644 content/ug/_index.md create mode 100644 content/ug/about.md create mode 100644 content/ug/docs/_index.md create mode 100644 content/ug/docs/campus/_index.md create mode 100644 content/ug/docs/campus/china/XJU.md create mode 100644 content/ug/docs/friendship/index.md create mode 100644 content/ug/docs/medicine/_index.md create mode 100644 content/ug/docs/medicine/hrt-overview.md create mode 100644 content/ug/docs/psyco/_index.md diff --git a/.markdownlint.json b/.markdownlint.json index 258fa1e2..5ed7b2b2 100644 --- a/.markdownlint.json +++ b/.markdownlint.json @@ -2,7 +2,7 @@ "single-h1": true, "no-inline-html": false, "no-duplicate-header": false, - "no-emphasis-as-header": true, + "no-emphasis-as-header": false, "line-length": false, "frontmatter": false } diff --git a/.markdownlintignore b/.markdownlintignore index 38a66204..cdd97398 100644 --- a/.markdownlintignore +++ b/.markdownlintignore @@ -1,2 +1,4 @@ /themes converter.md +cup-calculator.md +about.md diff --git a/assets/sass/base/_typography.scss b/assets/sass/base/_typography.scss index 9528557c..3e4f48df 100644 --- a/assets/sass/base/_typography.scss +++ b/assets/sass/base/_typography.scss @@ -2,7 +2,7 @@ * Basic typography style for copy text */ -@import url("https://fonts.googleapis.com/css2?family=Noto+Sans&family=Noto+Sans+SC&family=Noto+Sans+JP&family=IBM+Plex+Sans+Thai+Looped&display=swap"); +@import url("https://fonts.googleapis.com/css2?family=Noto+Sans&family=Noto+Sans+SC&family=Noto+Sans+JP&family=IBM+Plex+Sans+Thai+Looped&family=IBM+Plex+Sans+Arabic:wght@600&display=swap"); @font-face { font-family: LXGWClearGothic; @@ -16,25 +16,29 @@ body { "IBM Plex Sans Thai Looped", $text-font-stack; } -[lang="zh-cn"] body { +[lang="zh-cn"] * { font-family: "Noto Sans SC", "Hiragino Sans GB", "华文细黑", "STHeiti", "微软雅黑", "Microsoft YaHei", SimHei, "Helvetica Neue", Helvetica, Arial, "IBM Plex Sans Thai Looped", $text-font-stack; } -[lang="zh-hant"] body { +[lang="zh-hant"] * { font-family: LXGWClearGothic, "微軟正黑體", "Microsoft JhengHei", "新細明體", "PMingLiU", "細明體", "MingLiU", "蘋果儷中黑", "Apple LiGothic Medium", "儷黑 Pro", "LiHei Pro Medium", "IBM Plex Sans Thai Looped", $text-font-stack; } -[lang="ja"] body { +[lang="ja"] * { font-family: "Noto Sans JP", "ヒラギノ角ゴ Pro", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", "MS Gothic", "ＭＳ ゴシック", "Helvetica Neue", "IBM Plex Sans Thai Looped", Helvetica, Arial, $text-font-stack; } +.ug-arab-font { + font-family: "IBM Plex Sans Arabic", "Noto Sans Arabic", $text-font-stack; +} + html { font-family: sans-serif; -ms-text-size-adjust: 100%; diff --git a/config/_default/languages.toml b/config/_default/languages.toml index b894e2e7..6dc5b2a2 100644 --- a/config/_default/languages.toml +++ b/config/_default/languages.toml @@ -21,3 +21,9 @@ languageName = "繁體中文" weight = 1 contentdir = "content/zh-hant" + +[ug] + title = "MtF Wiki" + languageName = "Uyghurche" + weight = 4 + contentdir = "content/ug" diff --git a/config/_default/menus.ug.toml b/config/_default/menus.ug.toml new file mode 100644 index 00000000..e609400c --- /dev/null +++ b/config/_default/menus.ug.toml @@ -0,0 +1,11 @@ +[[main]] + identifier = "docs" + name = "Arxip" + url = "docs" + weight = 1 + +[[main]] + identifier = "about" + name = "Heqqide" + url = "about" + weight = 3 diff --git a/content/en/_index.md b/content/en/_index.md index caab1ae7..55af336b 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -44,5 +44,5 @@ footer: markdown: >

MtF Wiki

Copyright © 2020-2022 MtF Wiki. All rights reserved.

-
If you can remember my name, if you can all remember my name, maybe I or "we", will be able to live freely one day.
+
If you can remember my name, if you can all remember my name, maybe I or "we", will be able to live freely one day.
--- diff --git a/content/es/_index.md b/content/es/_index.md index 2965913b..5288f627 100644 --- a/content/es/_index.md +++ b/content/es/_index.md @@ -42,5 +42,5 @@ footer: markdown: >

MtF Wiki

Copyright © 2020-2022 MtF Wiki. All rights reserved.

-
Si puedes recordar mi nombre, si todos podéis recordarlo, tal vez yo o «nosotras», un día, vivamos libres.
+
Si puedes recordar mi nombre, si todos podéis recordarlo, tal vez yo o «nosotras», un día, vivamos libres.
--- diff --git a/content/ug/_index.md b/content/ug/_index.md new file mode 100644 index 00000000..36922286 --- /dev/null +++ b/content/ug/_index.md @@ -0,0 +1,47 @@ +--- +title: MtF Wiki +description: MtF Wiki +updatesBanner: "بىزنىڭ ھايات بولۇشىمىز يامان غەرەزگە قارشى ئەڭ چوڭ كۈرەش!" +landing: + height: 700 + image: new/mtf-wiki-square.svg + title: + - MtF Wiki + text: + - MtF Wiki gha qarshi alimiz. Dostlirimizgha tëximu yaxshi yardem qilish üchün MtF ning munasiwetlik uchurlirini retlewatimiz. + titleColor: + textColor: + spaceBetweenTitleText: 25 + buttons: + - link: docs + text: "Arxip" + color: primary + #backgroundImage: + # src: images/Transgender_Pride_Flag.webp + # height: 600 +footer: + sections: + - title: Tür + links: + - title: Bash bet + link: https://mtf.wiki + - title: Kod + link: https://github.com/mtf-wiki/MtF-Wiki + - title: Alaqe + links: + - title: Discord + link: https://233.plus/discord + - title: Twitter + link: https://twitter.com/mtfwiki + - title: GitHub + link: https://github.com/mtf-wiki + - title: Email + link: mailto:hi@mtf.wiki + contents: + align: left + applySinglePageCss: true + markdown: +

MtF Wiki

+

Copyright © 2020-2022 MtF Wiki. All rights reserved.

+
Eger siz ismimni ësingizde tutalisingiz, eger hemminglar ismimni ësingizde tutalisanglar, belkim men yaki «biz» belkim künlerning biride erkin halda yashaydu.
+--- diff --git a/content/ug/about.md b/content/ug/about.md new file mode 100644 index 00000000..07e74b63 --- /dev/null +++ b/content/ug/about.md @@ -0,0 +1,62 @@ +--- +title: "Heqqide" +description: "MtF Wiki heqsiz, ochuq we üzlüksiz yëngilanghan kwashingbyë-ayallar bilimlirini birleshtürüsh tor bëkiti bolushqa wede bëridu." +weight: 0 +--- + + + +![MtF-Wiki](/new/mtf-wiki-long.svg) + +MtF Wiki heqsiz, ochuq we üzlüksiz yëngilanghan kwashingbyë-ayallar bilimlirini birleshtürüsh tor bëkiti bolushqa wede bëridu. + +Türning GitHub Repo: + +Türning tor adrës: + + Eynek tor bëkiti: 、 + +Qërindash tor bëkiti: + +## Asasliq ezalar + +Qurghuchi: {{< github/profile "27522149" "kenchiu233" "Kenchiu" >}} + +{{< github/profile "43064781" "CoelacanthusHex" "Coelacanthus" >}}  + +{{< github/profile "26759054" "saeziae" "Altagh" >}}  + +{{< github/profile "44055214" "llh721113" "Jünyen" >}}  + +Barliq GitHub töhpikarlirigha rehmet: + +{{< github/contributors >}} + +we yardem bëridighan bashqa dostlar. + +## Alaqe + +Discord [![Discord][badge-discord]](https://233.plus/discord) + +Twitter {{< shields/twitter mtfwiki >}} + +GitHub [![GitHub issues][badge-github]](https://github.com/mtf-wiki/MtF-Wiki/issues/new/choose) + +Ëlëktronluq yollanma + +[badge-discord]: https://img.shields.io/discord/883004164760801320?style=flat-square +[badge-github]: https://img.shields.io/github/issues/mtf-wiki/MtF-Wiki?style=flat-square + +## Rehmet + +Bu tür hazir [Hugo][hugo-url] arqiliq [GitHub Pages][pages-url] da orunlashturulghan. bashtëmida [zdoc][zdoc-url] ishlitilidu, buning üchün rehmet! + +Bu türni teyyarlashta nurghun matëriyallar ishlitilgen, minnetdarliqimni bildürimen. + +--- + +[![知识共享许可协议](https://i.creativecommons.org/l/by-sa/4.0/88x31.png)](https://creativecommons.org/licenses/by-sa/4.0/) + +[hugo-url]: https://github.com/gohugoio/hugo +[zdoc-url]: https://github.com/zzossig/hugo-theme-zdoc +[pages-url]: https://pages.github.com diff --git a/content/ug/docs/_index.md b/content/ug/docs/_index.md new file mode 100644 index 00000000..0ae1c07e --- /dev/null +++ b/content/ug/docs/_index.md @@ -0,0 +1,25 @@ +--- +title: Qarshi alimiz +description: MtF Wiki Welcome +--- + +{{< mtf-wiki >}} gha qarshi alimiz. Bu yerde bir qisim kwashingbyë-ayallar topigha yardem bëreleydighan bir yer. + +MtF(Male-to-Female), kwashingbyë-ayallar, tughulghanda er qilip bëkitilgen ayal. + +{{< mtf-wiki >}} heqsiz, ochuq we üzlüksiz yëngilanghan kwashingbyë-ayallar bilimlirini birleshtürüsh tor bëkiti bolushqa wede bëridu, bu yerde her xil dawalash bilimliri we dawalash bayliqliri we bashqa ishlar bar. + +Nöwettiki {{}} deslepki basquchta. her xil matëriyallar tamamlanmighan bolushi mumkin, hetta bezi xataliqlarmu bolushi mumkin. barliq acha-singillarning bizge qoshulushini qarshi alimiz we {{}} gha töhpe qoshung. + +Bu tor bëketni qurushtiki esli meqsetke kelsek, köp qisim MtF guruppilirini bilim supisi bilen teminligendin bashqa, u yene bashqilarning jinsiy özgertishning mewjutluqini mueyyenleshtürüshige intizar. jinsiy yönilish, jins kimliki, jinsiy ipadilesh we kemsitish, kemsitish we zorawanliqtin xaliy bolushta hemme ademning barawer tallishi barliqini qobul qilish barawer hörmet qilish qimmitini tereqqiy qildurushqa we dostluq jem'iyiti berpa qilishqa paydiliq. + +Bu türni teyyarlashta nurghun matëriyallar ishlitilgen, minnetdarliqimni bildürimen. + +> Teshwish we chüshkünlükke hergiz teslim bolmang, biz axirida bu dunyadiki ornimizgha ërishimiz. + +**Kenchiu[^3], biz qaytip këlishingizni saqlawatimiz.** + +> Eger siz ismimni ësingizde tutalisingiz, eger hemminglar ismimni ësingizde tutalisanglar, belkim men yaki «biz» belkim künlerning biride erkin halda yashaydu. + +[^2]: +[^3]: Bu tor bëketning qurghuchisi kënchyu atalmish ​​«tüzitish» sewebidin qanunsiz türmige tashlanghan, buninggha oxshash weqeler junggoda köp uchrimaydu. diff --git a/content/ug/docs/campus/_index.md b/content/ug/docs/campus/_index.md new file mode 100644 index 00000000..dc55a7d0 --- /dev/null +++ b/content/ug/docs/campus/_index.md @@ -0,0 +1,7 @@ +--- +title: Mektep +weight: 9 +collapsible: false +--- + + diff --git a/content/ug/docs/campus/china/XJU.md b/content/ug/docs/campus/china/XJU.md new file mode 100644 index 00000000..aafb8c5e --- /dev/null +++ b/content/ug/docs/campus/china/XJU.md @@ -0,0 +1,43 @@ +--- +title: Shinjang Uniwérsitéti +--- + +Shinjang Uniwërstëti maarip ministirliki tessiqlighan 211 qurulushi diki nuqtiliq aliy mektep,jonggu shinjang uyghur aptonom rayoni urumchi shehrining jenub teripige jaylashqan. + +2 doletlik muhim oqutush turi (xenzuche az sanliq millet tili we edebiyati, qollinishchan matëmatika), 1 döletning achquchluq tëriqchiliq intizami (nopus, bayliq we muhit iqtisadi), 3 shwangyilyuning asasliq qurulush penliri (marksizm nezeriyisi, ximiye, kompyutër ilmi we tëxnikisi) bar. 3 pen (ximiye, qurulush, matëriyal) dunyadiki ESI ning aldinqi 1% qatarigha kirdi. + +### jughrapiyilik orun + +Youhao mektep rayoni: Ürümchi Saybagh rayoni Xibei yoli 448. Youhao soda rayonida. Yumshaq dëtal mektipi. +Honghu mektep rayoni: Ürümchi Tengritagh rayoni Ghalibiyet yoli 666, mëtro bar. Ijtimaiy penler. +Boda mektep rayoni: Ürümchi Bulaqtagh rayoni, u 2021-yili 10-ayde emdila yolgha qoyulghan mektep rayoni, uninggha baridighan ammiwi qatnash yoq, u qumluqqa jaylashqan bolup, etrapida soda esliheliri yoq, hazir bir pen-tëxnika mektep rayoni. + +### Yataq ehwali we ul eslihe + +Aptor peqet Honghu mektep rayonida yashighan bolghachqa, asasliqi bu yerdiki ehwalni teswirlep bergen. + +#### Yataq ehwali + +Honghu mektep rayoni toluq kurs yatiqi, aspirantlar yatiqi we xelq'araliq oqughuchilar yatiqigha ayrilidu. bu yataqlar biologiyilik jinsiy munasiwet we «'az sanliq milletler bilen xenzularning ortaq turalghusi» prinsipigha asasen teqsim qilinghan. yatiqini özgertishning ülgisi yoq. sharait yar berse, öy ijare alalaysiz. hazir, Kwashingbyë oqughuchiliri üchün ayrim yataq orunlashturushining ülgisi yoq. qandaqla bolmisun, yataqni özgertish yaki xamushluq kësilige giriptar bolghan bimarlarni yalghuz kishilik yataq bilen teminleshning ülgisi bar, teqsimat asasliqi xelq'araliq oqughuchilar yatiqida. + +toluq kurs erlirining yataq sharaiti adette nachar, ammiwi hajetxana bar. balkon yoq, alte kishilik öyde ikki kariwat bar. ayallar yatiqi köp qëtim rëmont qilinghan bolup, ehwali yaxshi. **kiyim ishkapi yoq**, bezi yataqlarda ishkap bar, emma aptorning üch yilliq yataq tejribisige asasen, nurghun ishkaplarni normal ishlitishke bolmaydu, hetta ishletkili bolmaydu. shunglashqa, chamadangha kiyim we yopkilarni qachilash muwapiq. + +aspirantlar yatiqi töt kishilik yataq. kiyim ishkapi we ayrim hajetxana bar. binalarning biri mektep sirtidiki bolup, awarichiliq tëximu köp. + +#### Chömülmek + +Siz peqet ammiwi munchaghila baralaysiz. munchining ikki qismi bar. adette, sol terepte bölek yoq, ong teripide bölümchi bar, emma üshshük sulyaw tam ishlitilidu. + +#### Ammiwi hajetxana + +**mektepning hëchqandaq yëride üchinchi hajetxana yoq** + +### Dawalash menbesi + +Mektep doxturxanisida azraq dawalash bar. zeherlik chëkimlikni peqet mektep dorixaniliridila ërishkili bolidu, hormon doriliri sëtilmaydu, mektep saghlamliq sughurtisi asasen yoq dëyerlik. + +### LGBT + +Oqutquchilar we sawaqdashlar dostane. qiziqish yaki bashqa sewebler tüpeylidin bir mezgil binormal heriketler bolushi mumkin bolsimu, ular bek köp arilashmaydu. + +Animë kulubigha kirish tewsiye qilinidu, u LGBT bilen intayin dostane. yuqiri yilliqtiki acha-singillar bek yaxshi, ular sizge girim qilishqa yardem bëreleydu yaki sizge ögitidu~ diff --git a/content/ug/docs/friendship/index.md b/content/ug/docs/friendship/index.md new file mode 100644 index 00000000..9967be77 --- /dev/null +++ b/content/ug/docs/friendship/index.md @@ -0,0 +1,28 @@ +--- +title: Dostluq kopiratsiye +weight: 10 +--- + +### QQ guruppa {#qq-group} + +### Kwashingbyëlik munasiwetlik bot (QQ) {#trans-bot} + +- QQ asasliq hësabat `2776456754` +- QQ zapaslash hësabat：`970611264` +- Limelight： + +### awesome trans (Twitter) + +- Twitter：{{< shields/twitter awesometrans_zh >}} +- Telegram：{{< shields/telegram awesometrans_zh >}} +- Email： + +### FtM (Female-to-Male) Wiki + + + +### Limelight + +«Jins köp xilliqi» munbiri + + diff --git a/content/ug/docs/medicine/_index.md b/content/ug/docs/medicine/_index.md new file mode 100644 index 00000000..707b79d4 --- /dev/null +++ b/content/ug/docs/medicine/_index.md @@ -0,0 +1,5 @@ +--- +title: Dora／HRT +weight: 1 +collapsible: true +--- diff --git a/content/ug/docs/medicine/hrt-overview.md b/content/ug/docs/medicine/hrt-overview.md new file mode 100644 index 00000000..a3c181c5 --- /dev/null +++ b/content/ug/docs/medicine/hrt-overview.md @@ -0,0 +1,11 @@ +--- +title: HRT omumiy körünüsh +weight: 1 +slug: overview +--- + +Kwashingbyë hormunini dawalash saghlamliq mulazimiti bolup, Kwashingbyë ning jinsiy salahiyitini ispatlaydu. Hormon arqiliq, kwashingbayning bedinining ikkilemchi jinsiy alahidiliki ularning jinsiy salahiyiti bilen maslishidu, ularning erlik yaki ayalliq özgirishi ilgiri sürülidu. Gerche hormon bilen dawalash barliq Kwashingbyë üchün zörür tallash bolmisimu, emma ëhtiyajliq bolghan Kwashingbyë gha nisbeten, hormon bilen dawalash dësforiyeni peseytish, özini qobul qilish we özini tonushtiki dawalash usuli. + +Hazirqi tetqiqatta körsitilishiche, hormon bilen dawalash kespiy doxturning yëtekchilikide we xeterni kontrol qilishta bixeter iken. Birleshken döletler kishilik hoquq ishxanisi qozghighan birleshken döletler erkin we barawerlik teshebbusi we «Yogyakarta prinsipi» namliq xelq'araliq höjjette herqaysi döletlerni kwashngbyëning kishilik hoquqini qoghdash üchün jins testiqlaydighan saghlamliq mulazimiti bilen teminleshke chaqirdi. + +Grche dölitimning qanun siyasitide Kwashingbyë hormunini dawalash uqumi ëniq tilgha ëlinmighan bolsimu, emma oxshimighan jinislarning barawer hoquqtin behrimen bolushi we jinsni asas qilghan kemsitishni cheklishi kërekliki tilgha ëlinghan bir qanche maddilar bar. Qandaqla bolmisun, Kwashingbyë hormunini dawalashqa ait konkrët siyaset we dawalash körsetmilirining kemchil bolushi Kwashingbyë gha kespiy dawalash yëtekchiliki kemchil bolush, saghlamliq xewipini ashurush we teshwish we chüshkünlükni keltürüp chiqiridighan muhim seweb. Shunglashqa, resmiy hormon bilen dawalash sistëmisining ornitilishi muhim emeliy ehmiyetke ige. diff --git a/content/ug/docs/psyco/_index.md b/content/ug/docs/psyco/_index.md new file mode 100644 index 00000000..1fbe4483 --- /dev/null +++ b/content/ug/docs/psyco/_index.md @@ -0,0 +1,5 @@ +--- +title: Rohiy késellik bölümi +weight: 2 +collapsible: true +--- diff --git a/content/zh-cn/_index.md b/content/zh-cn/_index.md index 22b41f61..882383bc 100644 --- a/content/zh-cn/_index.md +++ b/content/zh-cn/_index.md @@ -42,5 +42,5 @@ footer: markdown: >

MtF Wiki

Copyright © 2020-2022 MtF Wiki. All rights reserved.

-
如果你能记住我的名字，如果你们都能记住我的名字，也许我或者“我们”，终有一天能自由地生存着。
+
如果你能记住我的名字，如果你们都能记住我的名字，也许我或者“我们”，终有一天能自由地生存着。
--- diff --git a/content/zh-hant/_index.md b/content/zh-hant/_index.md index 7655378e..4fd16a3d 100644 --- a/content/zh-hant/_index.md +++ b/content/zh-hant/_index.md @@ -42,5 +42,5 @@ footer: markdown: >

MtF Wiki

Copyright © 2020-2022 MtF Wiki. All rights reserved.

-
如果你能記住我的名字，如果你們都能記住我的名字，也許我或者「我們」，終有一天能自由地生存著。
+
如果你能記住我的名字，如果你們都能記住我的名字，也許我或者「我們」，終有一天能自由地生存著。
---