From 52d44cfce8d53f4e1cd1e20ee876777d99196d04 Mon Sep 17 00:00:00 2001 From: liaoziqian Date: Fri, 29 Mar 2019 08:51:33 +0800 Subject: [PATCH 1/4] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 以列表形式展示更直观，本项目主要针对中国企业，固将简体中文置于最前面 --- README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b175ca3..e03cff1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,19 @@ 996.ICU === -*[English](en_US.md) ∙ [日本語](ja_JP.md) ∙ [简体中文](zh_CN.md) ∙ [繁體中文](zh_TW.md) ∙ [Le français](fr_FR.md) ∙ [German](de_DE.md) ∙ [Greek](gl-IT.md) ∙ [Italian](it_IT.md) ∙ [Portuguese](pt_PT.md) ∙ [Russian](ru_RU.md) ∙ [Spanish](es_MX.md) ∙ [Thai](th_TH.md) ∙ [Vietnamese](vi_VN.md)* +* [简体中文](zh_CN.md) +* [English](en_US.md) +* [繁體中文](zh_TW.md) +* [日本語](ja_JP.md) +* [Le français](fr_FR.md) +* [German](de_DE.md) +* [Greek](gl-IT.md) +* [Italian](it_IT.md) +* [Portuguese](pt_PT.md) +* [Russian](ru_RU.md) +* [Spanish](es_MX.md) +* [Thai](th_TH.md) +* [Vietnamese](vi_VN.md) --- From 19c1a86e02b4aaace1690c2de731cd092e86987c Mon Sep 17 00:00:00 2001 From: Try Date: Fri, 29 Mar 2019 08:57:52 +0800 Subject: [PATCH 2/4] Update README.md Fix the plural form.In this case,we should use 'contents' here. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b175ca3..3cfbca1 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Join discussion at [#20](https://github.com/996icu/996.ICU/issues/20). Contribution --- Any merged modification to all files will be rendered as github flavored markdown and published on the site regularly. -Feel free to adjust the format, add some content or fix grammatical errors. +Feel free to adjust the format, add some contents or fix grammatical errors. Expand influence --- From 5ca7f54df6778b9d579f6bbab7634600a60536e1 Mon Sep 17 00:00:00 2001 From: Hui Date: Fri, 29 Mar 2019 14:09:43 +1300 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 这么不通顺的地方居然无视么。。。 --- en_US.md | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/en_US.md b/en_US.md index 4ac05ba..b208e11 100644 --- a/en_US.md +++ b/en_US.md @@ -4,10 +4,10 @@ ## What is "996"? 996 working, ICU waiting. -"996" is an illegal work schedule (9 am - 9 pm, 6 days a week) that has become common. -Working for a company that encourages the "996" work schedule usually means working for more than 60 hours a week. +A "996" work schedule refers to an unofficial work schedule (9 am - 9 pm, 6 days a week) that has been gaining more popularity. +Serving a company that encourages the "996" work schedule usually means work for at least 60 hours a week. -Quoted from [Labour Law of the People's Republic of China](http://english.gov.cn/archive/laws_regulations/2014/08/23/content_281474983042473.htm): +Quoted from [Labor Law of the People's Republic of China](http://english.gov.cn/archive/laws_regulations/2014/08/23/content_281474983042473.htm) **Article 36**: > The State shall practice a working hour system wherein labourers shall work for no more than eight hours a day and no more than 44 hours a week on the average. @@ -36,20 +36,18 @@ Quoted from [Labour Law of the People's Republic of China](http://english.gov.cn ## Gaining more popularity and publicity -In early September 2016, words spread that __*58.com*__ (`58同城`, a classified advertisements company) introduced the "996" work schedule, without paying employees overtime for working weekends. The company later claimed that this was only conducted annually during September and October in face of increased business activities, and that following the schedule was by no means compulsory. +In early 2019, a Chinese E-commerce company called _Youzan_ announced the adoption of "996" work schedule at the company's annual party. "This would definitely be a good decision when we look back few years later.", commented by the CEO of Youzan. -In early 2019, __*Youzan*__ (`有赞`), a Hangzhou-based E-commerce company, announced its planned adoption of the "996" work schedule at the company's annual convention. Bai Ya, the CEO of Youzan, responded: "This would definitely prove to be a right decision when we look back in a few years." +In Mid-March 2019, it was reported that JD.com started adopting "996" or "995" work schedule in some of the business units. JD.com PR posted on their Maimai (`脉脉`, a Chinese real-name business social network platform) account: "(Our culture is) to devote ourselves with all our hearts (to achieve the business objectives)". -In mid-March 2019, it was reported that __*JD.com*__ (`京东`, a major E-commerce company) started adopting "996" or "995" work schedules in some departments. Its PRs posted the following on their Maimai (`脉脉`, a Chinese real-name business social network platform) account: "(Our culture is) to devote ourselves with whole heart (to achieve the business objectives)." - -Gaining more publicity only recently, this work schedule, however, has long been a known "secret" practiced in a lot of companies in China. +Although it is gaining more publicity recently, this work schedule is a commonly known "secret" practiced in a lot of companies in China. ## Compensation and benefits -According to the Labour Law, employees who follow the "996" work schedule deserve to be paid 2.275 times of their base salary. Unfortunately, people who work under "996" rarely receive overtime pay. +According to the Labor Law, employees who follow the "996" work schedule deserve to be paid 2.275 times of their base salary. Unfortunately, people who work under "996" rarely get paid for the overtime hours. ## Where does the name of the repo `996.ICU` come from? -If you continue to tolerate the "996" work schedule, you will risk your own health and might need to stay in an _**I**ntensive **C**are **U**nit_ someday. (`6` rhymes with `U` in Mandarin) +If you consistently follow the "996" work schedule, you run the risk of getting yourself into **I**ntensive **C**are **U**nit. -__Developers' lives matter.__ +Developers' lives matter. From 8ba47494f579cd1109ea16d308a36e73c2581176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=98=E6=A0=91=40=E9=98=BF=E9=87=8C?= Date: Fri, 29 Mar 2019 10:15:59 +0800 Subject: [PATCH 4/4] fix spell an ironic, . --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bd74888..5083e97 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ 996.ICU === -The name `996.ICU` refers to a ironic saying between chinese programmers **'Working at "996" pattern and being ill in the ICU(Intensive Care Unit)'**. That means if you consistently follow the "996" work schedule, you run the risk of getting yourself into Intensive Care Unit. +The name `996.ICU` refers to an ironic saying between chinese programmers **'Working at "996" pattern and being ill in the ICU(Intensive Care Unit)'**. That means if you consistently follow the "996" work schedule, you run the risk of getting yourself into Intensive Care Unit. *[English](en_US.md) ∙ [日本語](ja_JP.md) ∙ [简体中文](zh_CN.md) ∙ [繁體中文](zh_TW.md) ∙ [Le français](fr_FR.md) ∙ [Deutsch](de_DE.md) ∙ [Greek](gl-IT.md) ∙ [Italian](it_IT.md) ∙ [Portuguese](pt_PT.md) ∙ [Russian](ru_RU.md) ∙ [Spanish](es_MX.md) ∙ [Thai](th_TH.md) ∙ [Vietnamese](vi_VN.md)*