From bf43754af2ab5229d169d0d14e425fcfe7925692 Mon Sep 17 00:00:00 2001 From: "yan.bai" Date: Fri, 14 Jun 2024 16:10:49 +0900 Subject: [PATCH] add new line trans tag was renamed to translate revert button name changing Update button type Co-authored-by: Paul Traylor pull out service_action_button to new template Bump docker/build-push-action from 5.3.0 to 6.1.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.3.0 to 6.1.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v5.3.0...v6.1.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Bump actions/checkout from 4.1.6 to 4.1.7 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.6 to 4.1.7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.6...v4.1.7) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/django.yml | 2 +- .github/workflows/docker.yml | 4 +- .github/workflows/sphinx.yml | 2 +- promgen/locale/ja/LC_MESSAGES/django.po | 6 +-- .../promgen/service_action_button.html | 28 ++++++++++++++ promgen/templates/promgen/service_detail.html | 38 ++++--------------- .../promgen/service_detail_projects.html | 2 +- .../service_detail_projects_table.html | 2 +- 8 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 promgen/templates/promgen/service_action_button.html diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index 02ff7af2b..0a432fe92 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -36,7 +36,7 @@ jobs: --health-retries=3 steps: - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - uses: actions/setup-python@v5.1.0 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 734fb652a..99d84622f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 - name: Docker meta id: meta @@ -39,7 +39,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5.3.0 + uses: docker/build-push-action@v6.1.0 with: context: . push: ${{ github.event_name != 'pull_request' }} diff --git a/.github/workflows/sphinx.yml b/.github/workflows/sphinx.yml index 5233be2d9..8b0188ff4 100644 --- a/.github/workflows/sphinx.yml +++ b/.github/workflows/sphinx.yml @@ -21,7 +21,7 @@ jobs: python-version: ["3.9"] steps: - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - uses: actions/setup-python@v5.1.0 with: python-version: ${{ matrix.python-version }} diff --git a/promgen/locale/ja/LC_MESSAGES/django.po b/promgen/locale/ja/LC_MESSAGES/django.po index 89bf08987..c06544ec7 100644 --- a/promgen/locale/ja/LC_MESSAGES/django.po +++ b/promgen/locale/ja/LC_MESSAGES/django.po @@ -173,10 +173,6 @@ msgstr "Serviceを登録" msgid "Silence selected hosts" msgstr "選択したHostをSilence" -#: templates/promgen/service_detail.html:52 -msgid "Edit" -msgstr "Serviceを編集" - #: templates/promgen/service_detail.html:23 msgid "Actions" -msgstr "Actions" \ No newline at end of file +msgstr "Actions" diff --git a/promgen/templates/promgen/service_action_button.html b/promgen/templates/promgen/service_action_button.html new file mode 100644 index 000000000..84bf1b67b --- /dev/null +++ b/promgen/templates/promgen/service_action_button.html @@ -0,0 +1,28 @@ +{% load i18n %} +{% load promgen %} + +
+ + +
diff --git a/promgen/templates/promgen/service_detail.html b/promgen/templates/promgen/service_detail.html index dc77d14c1..8f472d6b0 100644 --- a/promgen/templates/promgen/service_detail.html +++ b/promgen/templates/promgen/service_detail.html @@ -12,41 +12,17 @@

Service: {{ service.name }}

{% if service.owner %} -

{% trans 'Contact' %}: {{service.owner.username}}

+

{% translate 'Contact' %}: {{service.owner.username}}

{% endif %}
-
- - -
- - {% trans "Silence" %} - - {% trans "Edit" %} + {% translate "Edit Service" %}
@@ -68,7 +44,7 @@

Service: {{ service.name }}

- {% trans "Register Rule" %} + {% translate "Register Rule" %}
{% if service.rule_set.count or request.site.rule_set.count %}
@@ -79,7 +55,7 @@

Service: {{ service.name }}

@@ -88,7 +64,7 @@

Service: {{ service.name }}

- {% trans "Register Notifier" %} + {% translate "Register Notifier" %}
{% if service.notifiers.count %}
diff --git a/promgen/templates/promgen/service_detail_projects.html b/promgen/templates/promgen/service_detail_projects.html index 48c77b187..c46624be9 100644 --- a/promgen/templates/promgen/service_detail_projects.html +++ b/promgen/templates/promgen/service_detail_projects.html @@ -3,7 +3,7 @@ {% regroup project_list|dictsort:"shard_id" by shard as project_shard_list %}
- {% trans "Register Project" %} + {% translate "Register Project" %}
{% for shard, shard_projects in project_shard_list %} diff --git a/promgen/templates/promgen/service_detail_projects_table.html b/promgen/templates/promgen/service_detail_projects_table.html index d162d1199..8a5e6dd95 100644 --- a/promgen/templates/promgen/service_detail_projects_table.html +++ b/promgen/templates/promgen/service_detail_projects_table.html @@ -13,7 +13,7 @@ - {% trans "No notifications configured for this project. Please configure some" %} + {% translate "No notifications configured for this project. Please configure some" %} {% endif %}