Skip to content

Added missing metrics English locale strings#8560

Merged
yadvr merged 2 commits intoapache:4.18from
kohrar:add_missing_en_locale
Feb 5, 2024
Merged

Added missing metrics English locale strings#8560
yadvr merged 2 commits intoapache:4.18from
kohrar:add_missing_en_locale

Conversation

@kohrar
Copy link
Copy Markdown
Contributor

@kohrar kohrar commented Jan 23, 2024

Description

This PR fixes two missing English locale strings that are missing in the metrics page in 4.18.1.

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • build/CI

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

Screenshot from 2024-01-23 15-02-43
Screenshot from 2024-01-23 15-02-30

How Has This Been Tested?

Rebuilt UI

How did you try to break this feature and the system with this change?

Trivial change and should not have any other side effects.

Comment thread ui/public/locales/en.json Outdated
@sureshanaparti sureshanaparti added this to the 4.18.2.0 milestone Jan 24, 2024
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 24, 2024

Codecov Report

Attention: 844 lines in your changes are missing coverage. Please review.

Comparison is base (33bb92a) 13.16% compared to head (7eca5b1) 30.77%.

❗ Current head 7eca5b1 differs from pull request most recent head 874daba. Consider uploading reports for the commit 874daba to get more accurate results

Files Patch % Lines
api/src/main/java/com/cloud/gpu/GPU.java 0.00% 98 Missing ⚠️
...apache/cloudstack/api/response/BucketResponse.java 0.00% 69 Missing ⚠️
...stack/api/command/user/bucket/CreateBucketCmd.java 2.56% 38 Missing ⚠️
...i/response/SecondaryStorageHeuristicsResponse.java 0.00% 34 Missing ⚠️
...nt/resource/consoleproxy/ConsoleProxyResource.java 0.00% 33 Missing ⚠️
...e/cloudstack/api/command/admin/vm/ImportVmCmd.java 3.12% 31 Missing ⚠️
...stack/api/command/user/bucket/UpdateBucketCmd.java 3.84% 25 Missing ⚠️
...ack/api/command/user/snapshot/CopySnapshotCmd.java 51.06% 15 Missing and 8 partials ⚠️
...command/admin/storage/AddObjectStoragePoolCmd.java 40.54% 20 Missing and 2 partials ⚠️
...e/cloudstack/api/response/ObjectStoreResponse.java 9.52% 19 Missing ⚠️
... and 92 more
Additional details and impacted files
@@              Coverage Diff              @@
##               4.18    #8560       +/-   ##
=============================================
+ Coverage     13.16%   30.77%   +17.60%     
- Complexity     9201    33968    +24767     
=============================================
  Files          2724     5341     +2617     
  Lines        258077   375027   +116950     
  Branches      40224    54554    +14330     
=============================================
+ Hits          33981   115415    +81434     
- Misses       219790   244350    +24560     
- Partials       4306    15262    +10956     
Flag Coverage Δ
simulator-marvin-tests 24.62% <28.87%> (?)
uitests 4.39% <ø> (?)
unit-tests 16.49% <35.41%> (?)

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Comment thread ui/public/locales/en.json Outdated
@shwstppr
Copy link
Copy Markdown
Contributor

@kohrar this needs to be targetted to 4.18 branch if you would want it to go in 4.18.2 cc @JoaoJandre

Copy link
Copy Markdown
Contributor

@sureshanaparti sureshanaparti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes lgtm

Copy link
Copy Markdown
Contributor

@JoaoJandre JoaoJandre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@DaanHoogland
Copy link
Copy Markdown
Contributor

@blueorangutan ui

@blueorangutan
Copy link
Copy Markdown

@DaanHoogland a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

@blueorangutan
Copy link
Copy Markdown

UI build: ✔️
Live QA URL: https://qa.cloudstack.cloud/simulator/pr/8560 (QA-JID-268)

Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, tested in qa

@DaanHoogland DaanHoogland modified the milestones: 4.18.2.0, 4.20.0.0 Jan 24, 2024
@DaanHoogland
Copy link
Copy Markdown
Contributor

@sureshanaparti this is based on main so I changed the milestone to 4.20.
@kohrar if you wnat this in 4.18.2 please git rebase --onto 4.18 <current base> <head>
cc @JoaoJandre

kohrar and others added 2 commits January 24, 2024 11:29
Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
@kohrar
Copy link
Copy Markdown
Contributor Author

kohrar commented Jan 24, 2024

@sureshanaparti this is based on main so I changed the milestone to 4.20. @kohrar if you wnat this in 4.18.2 please git rebase --onto 4.18 <current base> <head> cc @JoaoJandre

@DaanHoogland Thanks. I didn't realize I targetted main. I'll keep that in mind in the future. I've created a new PR (#8564) that targets 4.18. Is this the correct approach?

@harikrishna-patnala
Copy link
Copy Markdown
Member

@sureshanaparti this is based on main so I changed the milestone to 4.20. @kohrar if you wnat this in 4.18.2 please git rebase --onto 4.18 <current base> <head> cc @JoaoJandre

@DaanHoogland Thanks. I didn't realize I targetted main. I'll keep that in mind in the future. I've created a new PR (#8564) that targets 4.18. Is this the correct approach?

We don't have to create two PRs for two branches @kohrar. You can simply rebase this current branch with 4.18 (or force push to add_missing_en_locale) and change the apache:main to apache:4.18 in this PR itself.

@github-actions
Copy link
Copy Markdown

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

@kohrar kohrar changed the base branch from main to 4.18 January 25, 2024 08:30
@kohrar
Copy link
Copy Markdown
Contributor Author

kohrar commented Jan 25, 2024

@sureshanaparti this is based on main so I changed the milestone to 4.20. @kohrar if you wnat this in 4.18.2 please git rebase --onto 4.18 <current base> <head> cc @JoaoJandre

@DaanHoogland Thanks. I didn't realize I targetted main. I'll keep that in mind in the future. I've created a new PR (#8564) that targets 4.18. Is this the correct approach?

We don't have to create two PRs for two branches @kohrar. You can simply rebase this current branch with 4.18 (or force push to add_missing_en_locale) and change the apache:main to apache:4.18 in this PR itself.

😅 Thanks for the pointer. It took me a little too long to figure out how to change the PR to target 4.18 on GitHub. I hope that I got it right now!

@DaanHoogland
Copy link
Copy Markdown
Contributor

retesting;
@blueorangutan ui

@blueorangutan
Copy link
Copy Markdown

@DaanHoogland a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

@blueorangutan
Copy link
Copy Markdown

UI build: ✔️
Live QA URL: https://qa.cloudstack.cloud/simulator/pr/8560 (QA-JID-270)

@yadvr yadvr modified the milestones: 4.20.0.0, 4.18.2.0 Jan 29, 2024
@yadvr yadvr merged commit ca55fc0 into apache:4.18 Feb 5, 2024
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Feb 7, 2024
* Update ui/public/locales/en.json

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

* Update ui/public/locales/en.json

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

---------

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants