From 8e859604ef2cadb13aa95e365b76f5795fdbaf6b Mon Sep 17 00:00:00 2001 From: Norbert Orzechowicz Date: Mon, 25 Feb 2019 10:43:42 +0100 Subject: [PATCH 1/3] Fixed travis configuration for 2.0 branch (#108) --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e54e070..f2c8d6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,18 +5,22 @@ sudo: false cache: directories: - $HOME/.composer/cache - + matrix: include: - php: 5.3 env: DEPENDENCIES='low' + dist: precise - php: 5.3 + dist: precise - php: 5.4 - php: 5.5 - php: 5.6 - php: 7.0 + allow_failures: - php: hhvm + before_install: - composer self-update @@ -27,4 +31,4 @@ install: script: - ./bin/phpspec run --format=pretty - - ./bin/phpunit + - ./bin/phpunit From 11ccf452cd3e9ebd65d21d331dd9c83fa4d52cdf Mon Sep 17 00:00:00 2001 From: Jack Cherng Date: Mon, 25 Feb 2019 17:53:32 +0800 Subject: [PATCH 2/3] Add translation: zh_TW (#107) Signed-off-by: Jack Cherng --- .../translations/difference.zh_TW.yml | 35 +++++++++++++++++++ .../Resources/translations/oxford.zh_TW.yml | 3 ++ 2 files changed, 38 insertions(+) create mode 100644 src/Coduo/PHPHumanizer/Resources/translations/difference.zh_TW.yml create mode 100644 src/Coduo/PHPHumanizer/Resources/translations/oxford.zh_TW.yml diff --git a/src/Coduo/PHPHumanizer/Resources/translations/difference.zh_TW.yml b/src/Coduo/PHPHumanizer/Resources/translations/difference.zh_TW.yml new file mode 100644 index 0000000..5be5bb9 --- /dev/null +++ b/src/Coduo/PHPHumanizer/Resources/translations/difference.zh_TW.yml @@ -0,0 +1,35 @@ +just_now: + past: "[0,Inf] 剛剛" + future: "[0,Inf] 剛剛" +second: + past: "[1,Inf] %count% 秒前" + future: "[1,Inf] %count% 秒後" +minute: + past: "[1,Inf] %count% 分鐘前" + future: "[1,Inf] %count% 分鐘後" +hour: + past: "[1,Inf] %count% 小時前" + future: "[1,Inf] %count% 小時後" +day: + past: "[1,Inf] %count% 天前" + future: "[1,Inf] %count% 天後" +week: + past: "[1,Inf] %count% 週前" + future: "[1,Inf] %count% 週後" +month: + past: "[1,Inf] %count% 個月前" + future: "[1,Inf] %count% 個月後" +year: + past: "[1,Inf] %count% 年前" + future: "[1,Inf] %count% 年後" + +compound: + second: "[1,Inf] %count% 秒" + minute: "[1,Inf] %count% 分鐘" + hour: "[1,Inf] %count% 小時" + day: "[1,Inf] %count% 天" + week: "[1,Inf] %count% 週" + month: "[1,Inf] %count% 個月" + year: "[1,Inf] %count% 年" + past: "%value%前" + future: "%value%後" diff --git a/src/Coduo/PHPHumanizer/Resources/translations/oxford.zh_TW.yml b/src/Coduo/PHPHumanizer/Resources/translations/oxford.zh_TW.yml new file mode 100644 index 0000000..61dc201 --- /dev/null +++ b/src/Coduo/PHPHumanizer/Resources/translations/oxford.zh_TW.yml @@ -0,0 +1,3 @@ +only_two: "%first% 和 %second%" +comma_separated: "%list%, 和 %last%" +comma_separated_with_limit: "{1} %list% 和另一個|[2,Inf] %list% 和另 %count% 個" From a58f265d062963ab6e5ab0b636e79d6f9b1ffd6e Mon Sep 17 00:00:00 2001 From: Norbert Orzechowicz Date: Wed, 8 Jul 2020 14:33:30 +0200 Subject: [PATCH 3/3] Update composer.json --- composer.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/composer.json b/composer.json index 9d0b3bc..e070d9f 100644 --- a/composer.json +++ b/composer.json @@ -33,11 +33,6 @@ "Coduo\\PHPHumanizer\\Tests\\": "tests/" } }, - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, "suggest": { "ext-intl": "Required if you are going to use humanizer with different locales than en_EN" }