resolve merge conflict (b0362c4e) · Commits · 郑智淋 / github-readme-stats

CONTRIBUTING.md

+3 −3

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ _(make sure you already have a [vercel](https://vercel.com/) account)_

		## Themes Contribution

		Github readme stats supports custom theming and you can also contribute new themes!
		GitHub Readme Stats supports custom theming and you can also contribute new themes!

		All you need to do is edit [themes/index.js](./themes/index.js) file and add your theme at the end of the file.

		@@ -43,7 +43,7 @@ While creating the Pull request to add a new theme **don't forget to add a scree

		In short, when you submit changes, your submissions are understood to be under the same [MIT License](http://choosealicense.com/licenses/mit/) that covers the project. Feel free to contact the maintainers if that's a concern.

		## Report issues/bugs using Github's [issues](https://github.com/anuraghazra/github-readme-stats/issues)
		## Report issues/bugs using GitHub's [issues](https://github.com/anuraghazra/github-readme-stats/issues)

		We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/anuraghazra/github-readme-stats/issues/new/choose); it's that easy!

		@@ -55,7 +55,7 @@ We use GitHub issues to track public bugs. Report a bug by [opening a new issue]
		- Steps to reproduce
		- Be specific!
		- Share the snapshot, if possible.
		- Github Readme Stats' live link
		- GitHub Readme Stats' live link
		- What actually happens
		- What you expected would happen
		- Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)

api/top-langs.js

+4 −3

Original line number	Diff line number	Diff line
		@@ -14,13 +14,14 @@ module.exports = async (req, res) => {
		username,
		hide,
		hide_title,
		hide_border,
		card_width,
		title_color,
		text_color,
		bg_color,
		theme,
		cache_seconds,
		layout
		layout,
		} = req.query;
		let topLangs;

		@@ -42,15 +43,15 @@ module.exports = async (req, res) => {

		res.send(
		renderTopLanguages(topLangs, {
		theme,
		hide_title: parseBoolean(hide_title),
		hide_border: parseBoolean(hide_border),
		card_width: parseInt(card_width, 10),
		hide: parseArray(hide),
		title_color,
		text_color,
		bg_color,
		theme,
		layout
		layout,
		})
		);
		};

readme.md

+44 −22

Original line number	Diff line number	Diff line
		<p align="center">
		<img width="100px" src="https://res.cloudinary.com/anuraghazra/image/upload/v1594908242/logo_ccswme.svg" align="center" alt="Github Readme Stats" />
		<img width="100px" src="https://res.cloudinary.com/anuraghazra/image/upload/v1594908242/logo_ccswme.svg" align="center" alt="GitHub Readme Stats" />
		<h2 align="center">GitHub Readme Stats</h2>
		<p align="center">Get dynamically generated GitHub stats on your readmes!</p>
		</p>

		<p align="center">
		<a href="https://github.com/anuraghazra/github-readme-stats/actions">
		<img alt="Tests Passing" src="https://github.com/anuraghazra/github-readme-stats/workflows/Test/badge.svg" />
		@@ -17,6 +16,14 @@
		<a href="https://github.com/anuraghazra/github-readme-stats/pulls">
		<img alt="GitHub pull requests" src="https://img.shields.io/github/issues-pr/anuraghazra/github-readme-stats?color=0088ff" />
		</a>
		<br />
		<br />
		<a href="https://a.paddle.com/v2/click/16413/119403?link=1227">
		<img src="https://img.shields.io/badge/Supported%20by-VSCode%20Power%20User%20%E2%86%92-gray.svg?colorA=655BE1&colorB=4F44D6&style=for-the-badge"/>
		</a>
		<a href="https://a.paddle.com/v2/click/16413/119403?link=2345">
		<img src="https://img.shields.io/badge/Supported%20by-Node%20Cli.com%20%E2%86%92-gray.svg?colorA=61c265&colorB=4CAF50&style=for-the-badge"/>
		</a>
		</p>

		<p align="center">
		@@ -103,7 +110,7 @@ Use `?theme=THEME_NAME` parameter like so :-

		dark, radical, merko, gruvbox, tokyonight, onedark, cobalt, synthwave, highcontrast, dracula

		<img src="https://res.cloudinary.com/anuraghazra/image/upload/v1595174536/grs-themes_l4ynja.png" alt="Github Readme Stat Themes" width="600px"/>
		<img src="https://res.cloudinary.com/anuraghazra/image/upload/v1595174536/grs-themes_l4ynja.png" alt="GitHub Readme Stat Themes" width="600px"/>

		You can look at a preview for [all available themes](./themes/README.md) or checkout the [theme config file](./themes/index.js) & you can also contribute new themes if you like :D

		@@ -111,28 +118,43 @@ You can look at a preview for [all available themes](./themes/README.md) or chec

		You can customize the appearance of your `Stats Card` or `Repo Card` however you want with URL params.

		Customization Options:

		\| Option \| type \| description \| Stats Card (default) \| Repo Card (default) \| Top Lang Card (default) \|
		\| ------------- \| --------- \| ------------------------------------------- \| -------------------- \| ------------------- \| ----------------------- \|
		\| title_color \| hex color \| title color \| 2f80ed \| 2f80ed \| 2f80ed \|
		\| text_color \| hex color \| body color \| 333 \| 333 \| 333 \|
		\| icon_color \| hex color \| icon color \| 4c71f2 \| 586069 \| 586069 \|
		\| bg_color \| hex color \| card bg color \| FFFEFE \| FFFEFE \| FFFEFE \|
		\| line_height \| number \| control the line-height between text \| 30 \| N/A \| N/A \|
		\| hide \| CSV \| hides the items specified \| undefined \| N/A \| undefined \|
		\| hide_rank \| boolean \| hides the ranking \| false \| N/A \| N/A \|
		\| hide_title \| boolean \| hides the stats title \| false \| N/A \| false \|
		\| hide_border \| boolean \| hides the stats card border \| false \| N/A \| N/A \|
		\| show_owner \| boolean \| shows owner name in repo card \| N/A \| false \| N/A \|
		\| show_icons \| boolean \| shows icons \| false \| N/A \| N/A \|
		\| theme \| string \| sets inbuilt theme \| 'default' \| 'default_repocard' \| 'default' \|
		\| cache_seconds \| number \| manually set custom cache control \| 1800 \| 1800 \| '1800' \|
		\| count_private \| boolean \| counts private contributions too if enabled \| false \| N/A \| N/A \|
		\| layout \| string \| choose a layout option \| N/A \| N/A \| "default" \|
		#### Common Options:

		- `title_color` - Card's title color _(hex color)_
		- `text_color` - Body text color _(hex color)_
		- `icon_color` - Icons color if available _(hex color)_
		- `bg_color` - Card's background color _(hex color)_
		- `theme` - name of the theme, choose from [all available themes](./themes/README.md)
		- `cache_seconds` - set the cache header manually _(min: 1800, max: 86400)_

		> Note on cache: Repo cards have default cache of 30mins (1800 seconds) if the fork count & star count is less than 1k otherwise it's 2hours (7200). Also note that cache is clamped to minimum of 30min and maximum of 24hours

		#### Stats Card Exclusive Options:

		- `hide` - Hide's the specified items from stats _(Comma seperated values)_
		- `hide_title` - _(boolean)_
		- `hide_rank` - _(boolean)_
		- `show_icons` - _(boolean)_
		- `count_private` - Count private commits _(boolean)_
		- `line_height` - Sets the line-height betweent text _(number)_

		#### Repo Card Exclusive Options:

		- `show_owner` - Show the owner name of the repo _(boolean)_

		#### Language Card Exclusive Options:

		- `hide` - Hide the languages specified from the card _(Comma seperated values)_
		- `hide_title` - _(boolean)_
		- `layout` - Switch between two available layouts `default` & `compact`
		- `card_width` - Set the card's width manually _(number)_

		> :warning: Important:
		> Language names should be uri-escaped, as specified in [Percent Encoding](https://en.wikipedia.org/wiki/Percent-encoding)
		> (i.e: `c++` should become `c%2B%2B`, `jupyter notebook` should become `jupyter%20notebook`, etc.)

		---

		# GitHub Extra Pins

		GitHub extra pins allow you to pin more than 6 repositories in your profile using a GitHub readme profile.

readme_cn.md

+33 −26

Original line number	Diff line number	Diff line
		<p align="center">
		<img width="100px" src="https://res.cloudinary.com/anuraghazra/image/upload/v1594908242/logo_ccswme.svg" align="center" alt="Github Readme Stats" />
		<img width="100px" src="https://res.cloudinary.com/anuraghazra/image/upload/v1594908242/logo_ccswme.svg" align="center" alt="GitHub Readme Stats" />
		<h2 align="center">GitHub Readme Stats</h2>
		<p align="center">在你的 README 中获取动态生成的 GitHub 统计信息！</p>
		</p>
		@@ -17,6 +17,14 @@
		<a href="https://github.com/anuraghazra/github-readme-stats/pulls">
		<img alt="GitHub pull requests" src="https://img.shields.io/github/issues-pr/anuraghazra/github-readme-stats?color=0088ff" />
		</a>
		<br />
		<br />
		<a href="https://a.paddle.com/v2/click/16413/119403?link=1227">
		<img src="https://img.shields.io/badge/Supported%20by-VSCode%20Power%20User%20%E2%86%92-gray.svg?colorA=655BE1&colorB=4F44D6&style=for-the-badge"/>
		</a>
		<a href="https://a.paddle.com/v2/click/16413/119403?link=2345">
		<img src="https://img.shields.io/badge/Supported%20by-Node%20Cli.com%20%E2%86%92-gray.svg?colorA=61c265&colorB=4CAF50&style=for-the-badge"/>
		</a>
		</p>

		<p align="center">
		@@ -101,7 +109,7 @@ _注：如果你是自己部署本项目，私人贡献将会默认被计数，

		dark, radical, merko, gruvbox, tokyonight, onedark, cobalt, synthwave, highcontrast, dracula

		<img src="https://res.cloudinary.com/anuraghazra/image/upload/v1595174536/grs-themes_l4ynja.png" alt="Github Readme Stat Themes" width="600px"/>
		<img src="https://res.cloudinary.com/anuraghazra/image/upload/v1595174536/grs-themes_l4ynja.png" alt="GitHub Readme Stat Themes" width="600px"/>

		在 [theme config 文件](./themes/index.js) 中查看更多主题，或者贡献新的主题 :D

		@@ -112,7 +120,7 @@ dark, radical, merko, gruvbox, tokyonight, onedark, cobalt, synthwave, highcontr
		自定义选项：

		\| Option \| type \| description \| Stats Card (default) \| Repo Card (default) \| Top Lang Card (default) \|
		\| ----------- \| --------- \| --------------------------\| -------------------- \| ------------------- \| ------------------- \|
		\| ------------- \| --------- \| ---------------------------- \| -------------------- \| ------------------- \| ----------------------- \|
		\| title_color \| hex color \| 标题颜色 \| 2f80ed \| 2f80ed \| 2f80ed \|
		\| text_color \| hex color \| 字体颜色 \| 333 \| 333 \| 333 \|
		\| icon_color \| hex color \| 图标颜色 \| 4c71f2 \| 586069 \| 586069 \|
		@@ -125,11 +133,10 @@ dark, radical, merko, gruvbox, tokyonight, onedark, cobalt, synthwave, highcontr
		\| show_owner \| boolean \| 显示 Repo 卡片所属账户用户名 \| N/A \| false \| N/A \|
		\| show_icons \| boolean \| 显示图标 \| false \| N/A \| N/A \|
		\| theme \| string \| 设置主题 \| 'default' \| 'default_repocard' \| 'default' \|
		\| cache_seconds \| number \| 手动设置自定义缓存控制 \| 1800 \| 1800 \|'1800' \|
		\| cache_seconds \| number \| 手动设置自定义缓存控制 \| 1800 \| 1800 \| 1800 \|
		\| count_private \| boolean \| 统计私人贡献计数 \| false \| N/A \| N/A \|
		\| layout \| string \| 布局方式 \| N/A \| N/A \| 'default' \|


		> 注意缓存：Repo 卡片默认缓存 30 分钟，如果 fork 数和 star 数小于 1k ，则默认为 2 小时。缓存被限制为最少 30 分钟，最长 24 小时。

		# GitHub 更多置顶
		@@ -158,9 +165,9 @@ Endpoint: `api/pin?username=anuraghazra&repo=github-readme-stats`

		# 热门语言卡片

		热门语言卡片显示了Github用户常用的编程语言。
		热门语言卡片显示了 GitHub 用户常用的编程语言。

		注意：热门语言并不表示我的技能水平或类似的水平，它是用户在Github上拥有最多代码的一项指标，它是github-readme-stats的新功能
		_注意：热门语言并不表示我的技能水平或类似的水平，它是用户在 GitHub 上拥有最多代码的一项指标，它是 github-readme-stats 的新功能_

		### 使用细则

readme_de.md

+25 −17

Original line number	Diff line number	Diff line
		<p align="center">
		<img width="100px" src="https://res.cloudinary.com/anuraghazra/image/upload/v1594908242/logo_ccswme.svg" align="center" alt="Github Readme Stats" />
		<img width="100px" src="https://res.cloudinary.com/anuraghazra/image/upload/v1594908242/logo_ccswme.svg" align="center" alt="GitHub Readme Stats" />
		<h2 align="center">GitHub Readme Stats</h2>
		<p align="center">Zeige dynamisch generierte GitHub-Statistiken in deinen Readmes!</p>
		</p>
		@@ -17,6 +17,14 @@
		<a href="https://github.com/anuraghazra/github-readme-stats/pulls">
		<img alt="GitHub pull requests" src="https://img.shields.io/github/issues-pr/anuraghazra/github-readme-stats?color=0088ff" />
		</a>
		<br />
		<br />
		<a href="https://a.paddle.com/v2/click/16413/119403?link=1227">
		<img src="https://img.shields.io/badge/Supported%20by-VSCode%20Power%20User%20%E2%86%92-gray.svg?colorA=655BE1&colorB=4F44D6&style=for-the-badge"/>
		</a>
		<a href="https://a.paddle.com/v2/click/16413/119403?link=2345">
		<img src="https://img.shields.io/badge/Supported%20by-Node%20Cli.com%20%E2%86%92-gray.svg?colorA=61c265&colorB=4CAF50&style=for-the-badge"/>
		</a>
		</p>

		<p align="center">
		@@ -82,7 +90,7 @@ Benutze den `?theme=THEME_NAME`-Parameter wie folgt :-

		dark, radical, merko, gruvbox, tokyonight, onedark, cobalt, synthwave, highcontrast, dracula

		<img src="https://res.cloudinary.com/anuraghazra/image/upload/v1595174536/grs-themes_l4ynja.png" alt="Github Readme Stat Themes" width="600px"/>
		<img src="https://res.cloudinary.com/anuraghazra/image/upload/v1595174536/grs-themes_l4ynja.png" alt="GitHub Readme Stat Themes" width="600px"/>

		Du kannst dir eine Vorschau [aller verfügbaren Themes](./themes/README.md) ansehen oder die [theme config Datei](./themes/index.js) auschecken.
		Außerdem kannst du neue Themes beisteuern wenn du möchtest, contributions sind gern gesehen :D
		@@ -94,7 +102,7 @@ Du kannst das Erscheinungsbild deiner `Stats Card` oder `Repo Card`, mithilfe vo
		Anpassungsoptionen:

		\| Option \| Type \| Beschreibung \| Statistiken (default) \| Repo (default) \| Top Programmiersprachen (default) \|
		\| ---------------- \| --------- \| -----------------------------------------------------\| --------------------- \| ------------------- \| ----------------------- \|
		\| ---------------- \| --------- \| ---------------------------------------------------- \| --------------------- \| ------------------ \| --------------------------------- \|
		\| title_color \| hex color \| Titelfarbe \| 2f80ed \| 2f80ed \| 2f80ed \|
		\| text_color \| hex color \| Textkörperfarbe \| 333 \| 333 \| 333 \|
		\| icon_color \| hex color \| Iconfarbe \| 4c71f2 \| 586069 \| 586069 \|
		@@ -106,7 +114,7 @@ Anpassungsoptionen:
		\| show_owner \| boolean \| zeigt den Namen des Besitzers in der Repo-Karte \| N/A \| false \| N/A \|
		\| show_icons \| boolean \| zeige Icons an \| false \| N/A \| N/A \|
		\| theme \| string \| setze eingebaute themes \| 'default' \| 'default_repocard' \| 'default' \|
		\| cache_seconds \| number \| manuelles setzen der Cachezeiten \| 1800 \| 1800 \| '1800' \|
		\| cache_seconds \| number \| manuelles setzen der Cachezeiten \| 1800 \| 1800 \| 1800 \|
		\| hide_langs_below \| number \| verberge Sprachen unter einem bestimmten Schwellwert \| N/A \| N/A \| undefined \|

		> Hinweis bzgl. des Caches: Wenn die Anzahl der Forks und Stars geringer als 1Tsd ist, haben die Repo-Cards eine default Cachezeit von 30 Minuten (1800 Sekunden), ansonsten beträgt diese 2 Stunden (7200 Sekunden). Außerdem ist der Cache auf eine Minimum von 30 Minuten und ein Maximum von 24 Stunden begrenzt.

Admin message