Merge pull request #11259 from GeertvanHorrik/patch-1

Update en-us.yaml
rancher · Jun 21, 2024 · e8553ae · e8553ae
2 parents e750c25 + 3b8f09c
commit e8553ae
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts b/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
@@ -215,6 +215,8 @@ describe('Git Repo', { testIsolation: 'off', tags: ['@fleet', '@adminUser'] }, (
       ];
       const workspace = 'fleet-local';
 
+      cy.intercept('GET', '/v1/schemaDefinitions/fleet.cattle.io.gitrepo').as('gitrepo');
+
       // generate a fake cluster that can be usable in fleet
       generateFakeClusterDataAndIntercepts(fakeProvClusterId, fakeMgmtClusterId);
 
@@ -238,7 +240,7 @@ describe('Git Repo', { testIsolation: 'off', tags: ['@fleet', '@adminUser'] }, (
       const gitRepoDetails = new FleetGitRepoDetailsPo('fleet-local', basicRepos[1].name);
 
       gitRepoDetails.waitForPage();
-      gitRepoDetails.gitRepoTabs().clickTabWithSelector('[data-testid="bundles"]');
+      cy.wait('@gitrepo');
       gitRepoDetails.bundlesCount().should('contain', '1');
     });
 

diff --git a/scripts/e2e-docker-start b/scripts/e2e-docker-start
@@ -7,7 +7,7 @@ DASHBOARD_DIST=${DIR}/dist
 EMBER_DIST=${DIR}/dist_ember
 
 # Image version
-RANCHER_IMG_VERSION=v2.9-head
+RANCHER_IMG_VERSION=v2.9-b9ec494d4f6f1c3d6282c45a481dbb9d3c79bb6f-head
 
 docker run -d --restart=unless-stopped -p 80:80 -p 443:443 \
   -v ${DASHBOARD_DIST}:/usr/share/rancher/ui-dashboard/dashboard \

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
@@ -7315,7 +7315,7 @@ performance:
     checkboxLabel: Disable websocket notifications
   gc:
     label: Resource Garbage Collection
-    description: The UI will cache kuberentes resources locally to avoid having to re-fetch them. In some cases this can lead to a large amount of data stored in the browser. Enable this setting to periodically remove them.
+    description: The UI will cache Kubernetes resources locally to avoid having to re-fetch them. In some cases this can lead to a large amount of data stored in the browser. Enable this setting to periodically remove them.
     checkboxLabel: Enable Garbage Collection
     whenRun:
       description: Update when garbage collection runs

diff --git a/shell/assets/translations/zh-hans.yaml b/shell/assets/translations/zh-hans.yaml
@@ -7104,7 +7104,7 @@ performance:
     checkboxLabel: 禁用 WebSocket 通知
   gc:
     label: 资源垃圾回收
-    description: UI 将在本地缓存 kuberentes 资源，避免这些资源被重新抓取。在某些情况下，这可能会导致浏览器中存储了大量数据。你可以启用此设置进行定期删除。
+    description: UI 将在本地缓存 Kubernetes 资源，避免这些资源被重新抓取。在某些情况下，这可能会导致浏览器中存储了大量数据。你可以启用此设置进行定期删除。
     checkboxLabel: 启用垃圾回收
     whenRun:
       description: 垃圾回收运行的时候更新