Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix the uptime translation error #1605

Merged
merged 5 commits into from
Mar 23, 2021
Merged

fix: fix the uptime translation error #1605

merged 5 commits into from
Mar 23, 2021

Conversation

stu01509
Copy link
Contributor

@stu01509 stu01509 commented Mar 17, 2021

Please answer these questions before submitting a pull request

  • Why submit this pull request?

  • Bugfix

  • New feature provided

  • Improve performance

  • Backport patches

  • Related issues
    Fix Translation error #1596


Bugfix

Fix the uptime translation error in English mode.

  • How to fix?
    Add moment locale.

English Mode:
image

Chinese Mode:
image

@juzhiyuan
Copy link
Member

cc @guoqqqi to guide how to fix this test

@guoqqqi
Copy link
Member

guoqqqi commented Mar 17, 2021

OK, Let me check it.

@guoqqqi guoqqqi mentioned this pull request Mar 17, 2021
1 task
guoqqqi added a commit to guoqqqi/apisix-dashboard that referenced this pull request Mar 17, 2021
@guoqqqi
Copy link
Member

guoqqqi commented Mar 20, 2021

Hi, When you have time, please update the master code to fix the error.

@stu01509
Copy link
Contributor Author

Hi @guoqqqi

Update the commit

@codecov-io
Copy link

codecov-io commented Mar 20, 2021

Codecov Report

Merging #1605 (e7c8c63) into master (1ba32d9) will increase coverage by 0.07%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1605      +/-   ##
==========================================
+ Coverage   71.69%   71.76%   +0.07%     
==========================================
  Files         133      133              
  Lines        5469     5469              
  Branches      592      592              
==========================================
+ Hits         3921     3925       +4     
+ Misses       1305     1300       -5     
- Partials      243      244       +1     
Flag Coverage Δ
backend-e2e-test 61.86% <ø> (+0.12%) ⬆️
backend-e2e-test-ginkgo 47.73% <ø> (-0.13%) ⬇️
backend-unit-test 51.81% <ø> (ø)
frontend-e2e-test 72.58% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
api/internal/utils/closer.go 33.33% <0.00%> (ø)
api/internal/core/storage/etcd.go 47.27% <0.00%> (+3.63%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1ba32d9...e7c8c63. Read the comment docs.

@stu01509
Copy link
Contributor Author

Hi @juzhiyuan and @guoqqqi

Seems like this PR passed the CI, Please review it 😀

@juzhiyuan juzhiyuan requested review from Jaycean and LiteSun March 21, 2021 14:07
@guoqqqi guoqqqi mentioned this pull request Mar 22, 2021
4 tasks
@juzhiyuan
Copy link
Member

@stu01509 Hi, please sync latest codes.

@stu01509
Copy link
Contributor Author

@stu01509 Hi, please sync latest codes.

Done 😀

@juzhiyuan juzhiyuan merged commit 8e009b0 into apache:master Mar 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Translation error
8 participants