Merge branch 'master' into patch-2

2019-04-05 13:00:13 +08:00
parent cac3830baf 4c32f7ef73
commit baef19e350
14 changed files with 60 additions and 33 deletions
--- a/README.md
+++ b/README.md
@ -27,7 +27,7 @@ Related reports:
 What is 996?
 ---

-A "996" work schedule refers to an unofficial work schedule (9 a.m.&ndash;9 p.m., 6 days per week) that has been gaining in popularity. Serving a company that encourages the "996" work schedule usually means working for at least 60 hours per week.
+A "996" work schedule refers to an unofficial work schedule (9 a.m.&ndash;9 p.m., 6 days per week) that has been gaining popularity. Serving a company that encourages the "996" work schedule usually means working for at least 60 hours per week.


 What can I do?
@ -45,20 +45,20 @@ Principles and purposes

 * 996.ICU is an initiative initiated by IT practitioners. We welcome people from other fields and other countries to join the discussion.

-* This is not a political movement. We firmly uphold the labor law and require employers to respect the legitimate rights and interests of their employees.
+* This is not a political movement. We firmly uphold the labor law and request employers to respect the legitimate rights and interests of their employees.

 * It is a great progress from closed source to open source, and it will also be a great progress from open source to emphasizing labor rights at the same time. What we want is to create an open source software license that advocates workers' rights.

 * We are willing to hear all positive and constructive proposals and advocate mature and responsible speech.

-* We are working on the drafting of Anti-996 License right now and we hope to get help from professionals with relevant experience.
+* We are working on the drafting of Anti-996 License right now and we hope to receive assistance from professionals with relevant experience.


 Proposals
 ---
 A proposal is a document accepted by 996.ICU.  
-Typically, a proposal should give a solution or suggestion about the development of the project and community.  
-For more details, you can read the [proposal template](proposal/proposal_template.md) document.  
+Typically, a proposal should outline a solution or suggestion about the development of the project and community.  
+For more details, please read the [proposal template](proposal/proposal_template.md) document.  

 To help the development of 996.ICU, you can do several things base on proposals.

@ -67,10 +67,10 @@ To help the development of 996.ICU, you can do several things base on proposals.
 - Give your own proposals with a PR following the proposal format.


-Expand influence
+Expanding influence
 ---

-Feel free to [translate 996.ICU's contents](i18n/i18n.md), adjust the format, add some contents or fix grammatical errors. Please note that adding too many translations is getting off the track.
+Please feel free to [translate 996.ICU's contents](i18n/i18n.md), adjust the format, add some contents or fix grammatical errors. Please note that adding too many translations is getting off the track.


 Community powers
@ -99,9 +99,9 @@ License

 [Anti-996 License](LICENSE)

- - The purpose of this license is to prevent anti-labour-law companies from using the software or codes under the license, and force those companies to balance their work
+ - The purpose of this license is to prevent anti-labour-law companies from using the software or codes under the license, and force those companies to weigh their way of working
 - See a [full list of projects](awesomelist/projects.md) under Anti-996 License
 - It is an idea of @xushunke: [Design A Software License Of Labor Protection -- Anti 996 License](https://github.com/996icu/996.ICU/pull/15642)
 - This version of Anti-996 License is drafted by [Katt Gu, J.D, University of Illinois, College of Law](https://scholar.google.com.sg/citations?user=PTcpQwcAAAAJ&hl=en&oi=ao); advised by [Suji Yan](https://www.linkedin.com/in/tedkoyan/), CEO of [Dimension](https://www.dimension.im).  
 - This draft is adapted from the MIT license. For more detailed explanation, please see [Wiki](https://github.com/kattgu7/996-License-Draft/wiki). This license is designed to be compatible with all major open source licenses.  
- - For law professionals or anyone who is willing to contribute to further version directly, please go to [Anti-996-License-1.0](https://github.com/kattgu7/996-License-Draft). Thank you.
+ - For law professionals or anyone who is willing to contribute to future version directly, please go to [Anti-996-License-1.0](https://github.com/kattgu7/996-License-Draft). Thank you.
--- a/README_CN.md
+++ b/README_CN.md
@ -2,7 +2,7 @@
 =======
 * [English version](./README.md)

-`996.ICU`  是指“工作 996”， 生病 ICU 。这是中国程序员之间的一种自嘲说法，意思是如果按照 996 的模式工作，那以后就得进 ICU 了。
+`996.ICU`  是指“工作 996， 生病 ICU” 。这是中国程序员之间的一种自嘲说法，意思是如果按照 996 的模式工作，那以后就得进 ICU 了。

 [![LICENSE](https://img.shields.io/badge/license-Anti%20996-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE)
 [![Badge](https://img.shields.io/badge/link-996.icu-red.svg)](https://996.icu/#/zh_CN)
--- a/archived/licenses[WIP]/tools/gen-license-go/LICENSE
+++ b/archived/licenses[WIP]/tools/gen-license-go/LICENSE
@ -1,31 +1,29 @@
 Copyright © 2019 <copyright holders>
 The 996ICU License (996ICU)

-996ICU License 是一个关于 mit 的扩展协议.
-此协议扩展了 mit, mit 将在本协议文本末尾声明.
+996ICU License is an extented license for mit.
+This license extended mit, and mit will be declared at the foot of this license.

-要求得到授权的个人履行以下义务:
+Individual who seeks authorization must fulfill the following obligations:

-1.  将此授权文件包含在其任何副本以及软件的重要部分中.
+1. Including this authorization file in any of its copies and important parts of the software.

-要求得到授权的组织履行以下义务:
+Organization that seeks authorization must fulfill the following obligations:

-1.  将此授权文件包含在其任何副本以及软件的重要部分中.
-2.  不以任何形式或手段强迫其雇佣员工或临时劳动者进行超过当地法定最长劳动时间的劳动,
-    包括但不限于: 命令, 威胁, 暗示等.
-3.  不以任何形式报复不参与超过法定最长劳动时间的劳动的雇佣员工或临时劳动者,
-    包括但不限于: 辱骂等精神攻击, 殴打等人身伤害以及非法开除等.
-4.  组织其雇佣员工或临时劳动者进行超时劳动时，按不低于当地法规标准支付经济补偿.
-5.  此组织不在协议规定的黑名单中.
+1. Including this authorization file in any of its copies and important parts of the software.
+2. Not forcing any employee or temporary worker to work in excess of the legal maximum working time in any form or by any means, including but not limited to: orders, threats, implications, etc.
+3. Not retaliating against any employee or temporary worker without participating in labor in excess of the legal maximum working time in any form or by any means, including but not limited to: mental assaults, personal injuries, illegal deductions of due remuneration, illegal dismissals, etc.
+4. Paying economic compensation at no lower than the standards stipulated by local laws and regulations, when organizing employees or temporary workers to work overtime.
+5. This organization is not in the blacklist[^1] as stipulated in the agreement.

-如果获得授权的个人或组织未能履行以上义务任意一条, 则授权将被收回.
+If the authorized individual or organization fails to fulfill any of the above obligations, the authorization will be withdrawn.

-此协议未定义的行为, 按 mit 协议处理.
-mit 与本协议冲突的部分, 按本协议处理.
+The undefined behavior of this license is handled by mit. The part of mit that conflicts with this agreement is handled in accordance with this agreement.

-https://github.com/996icu/996.ICU/pull/15642
-996 from https://feathub.com/LinXueyuanStdio/996.ICU
-黑名单: https://github.com/996icu/996.ICU/blob/master/blacklist/blacklist.md
+
+* Discussion https://github.com/996icu/996.ICU/pull/15642
+* 996 from https://feathub.com/LinXueyuanStdio/996.ICU
+* [^1]: blacklist https://github.com/996icu/996.ICU/blob/master/blacklist/blacklist.md

 mit
 --------------------------------------------------------------------------------
--- a/archived/licenses[WIP]/tools/gen-license-go/go.mod
+++ b/archived/licenses[WIP]/tools/gen-license-go/go.mod
@ -0,0 +1,6 @@
+module github.com/panjf2000/gen-license-go
+
+require (
+	github.com/spf13/cobra v0.0.3
+	github.com/spf13/pflag v1.0.3 // indirect
+)
--- a/archived/licenses[WIP]/tools/gen-license-go/go.sum
+++ b/archived/licenses[WIP]/tools/gen-license-go/go.sum
@ -0,0 +1,4 @@
+github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
--- a/awesomelist/projects.md
+++ b/awesomelist/projects.md
@ -1,4 +1,4 @@
-Projects under 996ICU License. Thanks for your support!
+Projects under Anti 996ICU License. Thanks for your support!
 ===

 贡献指南
@ -31,7 +31,6 @@ Projects under 996ICU License. Thanks for your support!
 | - | [aya-store](https://github.com/milobluebell/aya-store) | [Github](https://github.com/milobluebell/aya-store) | 小程序状态管理模块 |
 | - | [eppdev-jee-pom](https://github.com/eppdev/eppdev-jee-pom) | [eppdev-jee-pom](https://jee.eppdev.cn) | 数据驱动的JavaEE代码生成程序 |
 | <img src="https://github.com/l-hammer/You-need-to-know-css/raw/master/static/logo.png" width="60"> | [You-need-to-know-css](https://github.com/l-hammer/You-need-to-know-css) |[You-need-to-know-css](https://lhammer.cn/You-need-to-know-css)| 💄CSS tricks for web developers~ |
-| - | [Android-KlineChar](https://github.com/icechao/kline) |[icechao](https://github.com/icechao)| 安卓高仿火币,快速实现K线功能的lib |
 | <img src="./img/awesome_golang_leetcode_logo.png" width="60"> | [awesome-golang-leetcode](https://github.com/kylesliu/awesome-golang-leetcode) |[Kyle Liu](https://github.com/kylesliu)| 📝  LeetCode of algorithms with golang solution(updating). |
 | - | [easy-filter](https://github.com/PsChina/easy-filter) | [Github](https://github.com/PsChina) / [npm](https://www.npmjs.com/package/easy-filter) | vue2.x 过滤器插件 |
 | - | [Vueg](https://github.com/jaweii/Vueg----page-transition-plugin) | [Github](https://github.com/jaweii/Vueg----page-transition-plugin) | Page level transition plugin for vue-router|
@ -96,3 +95,6 @@ Projects under 996ICU License. Thanks for your support!
 | - | [AndroidAnti996Browser](https://github.com/xianfengting/AndroidAnti996Browser) | [Github](https://github.com/xianfengting/AndroidAnti996Browser) | Android反996浏览器项目,为996\.ICU项目而开发,用以解决部分国产浏览器限制或禁止访问996\.ICU相关页面的问题\.目前该项目正在开发中,欢迎大家的支持\. |
 | - | [QuickFrontend](https://github.com/sinri/QuickFrontend) | [GitHub](https://github.com/sinri/QuickFrontend) | A simple frontend framework is designed for quick develop with vue.js 2, iview.ui 3, axios, js-cookie. |
 | - | [QTL](https://github.com/znone/qtl) | [GitHub](https://github.com/znone/qtl) | A friendly and lightweight C++ database library for MySQL, SQLite and ODBC. |
+| - | [go-server-js](https://github.com/zengming00/go-server-js) | [GitHub](https://github.com/zengming00/go-server-js) |  javascript web server, js server, 一种新的javascript写服务端程序的方案，没有回调，完全不同于node.js，更像php，或者说是披着js皮的go |
+| - | [node-gd-bmp](https://github.com/zengming00/node-gd-bmp) | [GitHub](https://github.com/zengming00/node-gd-bmp) | light and high speed and 100% js implement graphical library, it can running in any platform  |
+| <img src="https://github.com/Mainvooid/arxiv.repo/blob/master/icon.png" width="60"> | [arxiv.repo](https://github.com/Mainvooid/arxiv.repo) | [Github](https://github.com/Mainvooid/arxiv.repo) | arXiv上公开了项目源码的论文合集 |
--- a/blacklist/blacklist.md
+++ b/blacklist/blacklist.md
@ -7,6 +7,7 @@
 1. [《中华人民共和国劳动法》](http://www.npc.gov.cn/npc/xinwen/2019-01/07/content_2070261.htm)第四章第四十一条
 2. [《中华人民共和国劳动法》](http://www.npc.gov.cn/npc/xinwen/2019-01/07/content_2070261.htm)第四章第四十三条
 3. [《中华人民共和国劳动法》](http://www.npc.gov.cn/npc/xinwen/2019-01/07/content_2070261.htm)第四章第四十四条
+4. [《中华人民共和国刑法修正案（八）》](http://www.npc.gov.cn/npc/xinwen/2011-02/25/content_1625679.htm)第四十一条


 贡献指南
--- a/externals/news.md
+++ b/externals/news.md
@ -11,3 +11,4 @@
 - 《好奇心日报》：[996 惹怒程序员之后，他们的抗议引发了全球关注](https://www.qdaily.com/articles/62652.html)
 - 《新华网》：[被“996”工作制围困的年轻人：像是定好闹钟的机器](http://www.xinhuanet.com/2019-04/02/c_1124313774.htm)
 - 《北京青年报》：[40家互联网公司陷“996”工作制风波](http://www.chinanews.com/sh/2019/04-05/8801021.shtml)
+- 《深圳卫视》：[滚蛋吧，“996”式加班！](https://www.toutiao.com/a6675967261229974023)
--- a/i18n/en_US.md
+++ b/i18n/en_US.md
@ -10,6 +10,8 @@ Serving in a company that encourages the "996" work schedule usually means worki

 ## Laws and Regulations

+A "996" work schedule is in **blunt violation** of the Constitution of the People's Republic of China along with multiple other legislations:
+
 ### The Constitution of the People's Republic of China

 #### Chapter II: Article 43:
--- a/i18n/fr_FR.md
+++ b/i18n/fr_FR.md
@ -14,11 +14,11 @@ L'article 41 de la [Loi du travail de la République populaire de Chine](http://

 ## Gain de popularité

-En novembre 2018, [Jumei](https://www.jumei.com) a commencé à adopter le régime de travail « 996 » et à le considérer comme les horaires de travail normales. La société refuse toute rémunération pour les heures supplémentaires et ne donne aucun jour de congé payé. Même un jour de congé sans solde doit compter 11 heures au lieu de 8 heures. Le samedi, les employés doivent envoyer un e-mail au directeur du département pour approuver le "congé". En janvier 2019, les employés d'un nouveau groupe de Jumei appelé Wangwang ont été forcés à abandonner tous les congés, la durée du service. Ils étaient par ailleurs obligés de transferer le contrat de travail à Jumei, sans quoi ils étaient renvoyés.
+En novembre 2018, [Jumei](https://www.jumei.com) a commencé à adopter le régime de travail « 996 » et à le considérer comme les horaires de travail normaux. La société refuse toute rémunération pour les heures supplémentaires et ne donne aucun jour de congé payé. Même un jour de congé sans solde doit compter 11 heures au lieu de 8 heures. Le samedi, les employés doivent envoyer un e-mail au directeur du département pour approuver le "congé". En janvier 2019, les employés d'un nouveau groupe de Jumei appelé Wangwang ont été forcés à abandonner tous les congés, la durée du service. Ils étaient par ailleurs obligés de transférer le contrat de travail à Jumei, sans quoi ils étaient renvoyés.

 Début 2019, une entreprise d'e-commerce chinoise appelée _Youzan_ a déclaré son adoption au régime de travail « 996 » lors de la fête du Nouvel An Chinois de la société. Le PDG de Youzan a annoncé que ce sera certainement une bonne décision si une rétrospective est faite quelques années plus tard.

-Mi-mars 2019, il a été signalé que [Jingdong](https://www.jd.com) avait commencé à adopter le mode de fonctionnement « 996 » ou « 995 » dans certaines unités commerciales. Le département des relations publiquess chez JD a publié sur son compte maimai (`脉脉`, une plate-forme de réseau social d'entreprises chinoises): « (Notre culture consiste à) nous consacrer de tout notre cœur (à atteindre les objectifs de l'entreprise). »
+Mi-mars 2019, il a été signalé que [Jingdong](https://www.jd.com) avait commencé à adopter le mode de fonctionnement « 996 » ou « 995 » dans certaines unités commerciales. Le département des relations publiques chez JD a publié sur son compte maimai (`脉脉`, une plate-forme de réseau social d'entreprises chinoises): « (Notre culture consiste à) nous consacrer de tout notre cœur (à atteindre les objectifs de l'entreprise). »

 ## Compensation et récompense

@ -26,6 +26,6 @@ Selon la loi du travail en Chine, les employés qui suivent le schéma de travai

 ## D'où vient le nom du repo `996.ICU` (`996.USI` en français) ?

-A cause du mode de travail « 996 », beaucoup de travailleurs risquent de finir dans l'**U**nité de **S**oins **I**ntensifs (**I**ntensive **C**are **U**nit en anglais).
+À cause du mode de travail « 996 », beaucoup de travailleurs risquent de finir dans l'**U**nité de **S**oins **I**ntensifs (**I**ntensive **C**are **U**nit en anglais).

 La vie des développeurs compte.
--- a/i18n/zh-Hans.md
+++ b/i18n/zh-Hans.md
@ -10,6 +10,8 @@

 ## 相关法律法规

+“996”工作制，是对包括中华人民共和国宪法在内的如下法律法规的**公然违反**。
+
 ### [《中华人民共和国宪法》](http://www.npc.gov.cn/npc/xinwen/2018-03/22/content_2052489.htm)

 #### 第二章第四十三条：
--- a/i18n/zh-Hant-HK.md
+++ b/i18n/zh-Hant-HK.md
@ -10,6 +10,8 @@

 ## 相關法規

+“996”工作制，是對包括中華人民共和國憲法在內的如下法律法規的**公然違反**。
+
 ### [《中華人民共和國憲法》](http://www.npc.gov.cn/npc/xinwen/2018-03/22/content_2052489.htm)

 #### 第二章第四十三條：
--- a/i18n/zh-Hant.md
+++ b/i18n/zh-Hant.md
@ -10,6 +10,8 @@

 ## 相關法規

+“996”工作制，是對包括中華人民共和國憲法在內的如下法律法規的**公然違反**。
+
 ### [《中華人民共和國憲法》](http://www.npc.gov.cn/npc/xinwen/2018-03/22/content_2052489.htm)

 #### 第二章第四十三條：
--- a/i18n/zh-lzh-Hans.md
+++ b/i18n/zh-lzh-Hans.md
@ -3,6 +3,13 @@

 “996”工制，即朝九晚九，每周六日，周工时逾七十二。

+### [《中华人民共和国宪法》](http://www.npc.gov.cn/npc/xinwen/2018-03/22/content_2052489.htm)
+
+#### 第二章第四十三条：
+
+> 中华人民共和国劳动者有休息的权利。  
+> 国家发展劳动者休息和休养的设施，规定职工的工作时间和休假制度。  
+
 #### 中国大陆工时规管现况（标准工时）：
 日均八工时，周限四十工时；加班工时日限三而月限三十六，逾时工薪不低于平日150%。周工时限四十八。月均计薪日为21.75。