foreman_theme_satellite 13.3.2 → 14.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (30) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/app/assets/javascripts/foreman_theme_satellite/locale/ka/foreman_theme_satellite.js +62 -62
  4. data/app/views/foreman_theme_satellite/_theme_client_side_branding.js.erb +28 -38
  5. data/db/migrate/20181108171732_change_blog_url.rb +1 -1
  6. data/lib/foreman_theme_satellite/documentation.rb +4 -4
  7. data/lib/foreman_theme_satellite/engine.rb +5 -22
  8. data/lib/foreman_theme_satellite/{branded_words.rb → foreman_brand.rb} +14 -29
  9. data/lib/foreman_theme_satellite/replacer_repository.rb +0 -1
  10. data/lib/foreman_theme_satellite/version.rb +1 -1
  11. data/locale/Makefile +2 -12
  12. data/locale/ka/LC_MESSAGES/foreman_theme_satellite.mo +0 -0
  13. data/locale/ka/foreman_theme_satellite.po +1 -1
  14. data/package.json +1 -1
  15. metadata +4 -19
  16. data/app/assets/javascripts/foreman_theme_satellite/locale/es/foreman_theme_satellite.js +0 -124
  17. data/app/assets/javascripts/foreman_theme_satellite/locale/fr/foreman_theme_satellite.js +0 -124
  18. data/app/assets/javascripts/foreman_theme_satellite/locale/ja/foreman_theme_satellite.js +0 -124
  19. data/app/assets/javascripts/foreman_theme_satellite/locale/pt_BR/foreman_theme_satellite.js +0 -124
  20. data/app/assets/javascripts/foreman_theme_satellite/locale/zh_CN/foreman_theme_satellite.js +0 -124
  21. data/locale/es/LC_MESSAGES/foreman_theme_satellite.mo +0 -0
  22. data/locale/es/foreman_theme_satellite.po +0 -126
  23. data/locale/fr/LC_MESSAGES/foreman_theme_satellite.mo +0 -0
  24. data/locale/fr/foreman_theme_satellite.po +0 -127
  25. data/locale/ja/LC_MESSAGES/foreman_theme_satellite.mo +0 -0
  26. data/locale/ja/foreman_theme_satellite.po +0 -123
  27. data/locale/pt_BR/LC_MESSAGES/foreman_theme_satellite.mo +0 -0
  28. data/locale/pt_BR/foreman_theme_satellite.po +0 -128
  29. data/locale/zh_CN/LC_MESSAGES/foreman_theme_satellite.mo +0 -0
  30. data/locale/zh_CN/foreman_theme_satellite.po +0 -126
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 78de52218bf1a707dfe0f6ce468939002bbc45f410ccddfd158889f74f5c4d98
4
- data.tar.gz: eb0fb26e46a4dc2e6f6d81ecce42a620dfc1686c9b49afa855e4eac00705b30f
3
+ metadata.gz: 1ad1e23c6062e9751dfde7648814703fc6656e0604763d7f8f228e3a6f3e7cb8
4
+ data.tar.gz: 7a1b7d7a9119e28ff201abed28caecb39034dae5b1efe41a0dad098c45e192ff
5
5
  SHA512:
6
- metadata.gz: 34845967451db88360cb2c3fcd8aecc34c0a273298961686f55ea03a98a67e646c6258003a2b18b3b9c3c5017af9cc7669911a095718644396782e328f31c7b1
7
- data.tar.gz: 798d983082f412bfef5ed74f8ae79a363dd202f38113ec33e2d58d2d895b5be6e3247dbe918467dbff495940c0965266e4737277435c0302cd9bbdc659c56446
6
+ metadata.gz: f1faf4f3c03596f4975f169baefdacab1417e7a2e9ea81ce41d48d6cc86889a4571b9da65df98c53d4e1bd8693929e63fb08642dfa15c4c0cad94905d98b10fd
7
+ data.tar.gz: c9e43a7fb53b21d2147a27ccc9f7b3407400a3367d35027b6957e30ee1ab05e76fdf3c55eb18dbb0adebb5e08d585aa233c2f30046c20fc08ec0c004b1153a32
data/README.md CHANGED
@@ -36,7 +36,7 @@ const SettingName = ({ setting }) => (
36
36
 
37
37
  In case there is a need to add more terms to be branded **or bypass branding**,
38
38
  it can be done in
39
- [`branded_words.rb`](https://github.com/RedHatSatellite/foreman_theme_satellite/blob/develop/lib/foreman_theme_satellite/branded_words.rb).
39
+ [`foreman_brand.rb`](https://github.com/RedHatSatellite/foreman_theme_satellite/blob/develop/lib/foreman_theme_satellite/foreman_brand.rb).
40
40
  This is a dictionary where the key is a
41
41
  [Regular Expression](https://regex101.com/) and the value is a replacement
42
42
  string.
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_theme_satellite": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_theme_satellite 14.0.1",
6
+ "Project-Id-Version": "foreman_theme_satellite 13.2.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2023-11-21 10:43+0000",
9
9
  "Last-Translator": "Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2023",
@@ -17,29 +17,23 @@
17
17
  "domain": "foreman_theme_satellite",
18
18
  "plural_forms": "nplurals=2; plural=(n!=1);"
19
19
  },
20
- "(build: %{version})": [
21
- "(აგება: %{version})"
22
- ],
23
- "API Guide": [
24
- "API-ის გიდი"
25
- ],
26
- "Administering Red Hat Satellite": [
27
- "Red Hat Satellite-ის ადმინისტრირება"
20
+ "Supported by Red Hat": [
21
+ "მხარდაჭერილია Red Hat-ის მიერ"
28
22
  ],
29
- "Blog": [
30
- "ბლოგი"
23
+ "RHEV integration is deprecated.": [
24
+ "RHEV-ის ჩაშენება მოძველებულია."
31
25
  ],
32
- "Customer portal": [
33
- "მომხმარებლის პორტალი"
26
+ "On August 31, 2022, Red Hat Virtualization entered the Maintenance Support Phase. The Maintenance Support Phase runs until August 31, 2024, followed by the Extended Life Phase, which runs until August 31, 2026.": [
27
+ "2022 წლის 31 აგვისტოს RHEV რემონტის მხარდაჭერის ფაზაზე გადავიდა. ის 2024 წლის 31 აგვისტომდე გაგრძელდება, რომელიც გაფართოებული სიცოცხლის ფაზით გაგრძელდება, 2026 წლის 31 აგვისტომდე."
34
28
  ],
35
- "Documentation": [
36
- "დოკუმენტაცია"
29
+ "More information": [
30
+ "მეტი ინფორმაცია"
37
31
  ],
38
- "Environment only": [
39
- "მხოლოდ გარემო"
32
+ "When editing a Template, you must assign a list of Operating Systems with which this Template can be used. Optionally, you can restrict a template to a list of Hostgroups or Environments.": [
33
+ "შაბლონის რედაქტირებისას თქვენ უნდა მიანიჭოთ სია ოპერაციული სისტემებისა, რომლებთანაც შესაძლებელია ამ შაბლონის გამოყენება. სურვილისამებრ, შეგიძლიათ, შაბლონი ჰოსტების ჯგუფების სიით ან/და გარემოებით შეზღუდოთ."
40
34
  ],
41
- "Full trace": [
42
- "სრული ტრეისი"
35
+ "When a Host requests a template (e.g. during provisioning), Foreman selects the optimal match from the available templates of that type, in the following order:": [
36
+ "როდესაც ჰოსტი მოითხოვს შაბლონს (მაგ. სამუშაოდ მომზადების დროს), Foreman საუკეთესო შესატყვისს ამ ტიპის არსებული შაბლონებიდან შემდეგი თანამიმდევრობით შეარჩევს:"
43
37
  ],
44
38
  "Host group and Environment": [
45
39
  "ჰოსტების ჯგუფი და გარემო"
@@ -47,77 +41,83 @@
47
41
  "Host group only": [
48
42
  "მხოლოდ ჰოსტების ჯგუფი"
49
43
  ],
50
- "IRC": [
51
- "IRC"
52
- ],
53
- "If you feel this is an error with Satellite 6 itself, please open a new issue with": [
54
- "თუ გგონიათ, რომ ეს შეცდომა Satellite 6-ის შეცდომაა, გახსენით ახალი ბილეთი"
55
- ],
56
- "Includes %{system} © 2009-%{year} Paul Kelly and Ohad Levy": [
57
- "შეიცავს %{system} © 2009-%{year} პოლ კელი და ოჰედ ლევი"
58
- ],
59
- "More information": [
60
- "მეტი ინფორმაცია"
61
- ],
62
- "On August 31, 2022, Red Hat Virtualization entered the Maintenance Support Phase. The Maintenance Support Phase runs until August 31, 2024, followed by the Extended Life Phase, which runs until August 31, 2026.": [
63
- "2022 წლის 31 აგვისტოს RHEV რემონტის მხარდაჭერის ფაზაზე გადავიდა. ის 2024 წლის 31 აგვისტომდე გაგრძელდება, რომელიც გაფართოებული სიცოცხლის ფაზით გაგრძელდება, 2026 წლის 31 აგვისტომდე."
64
- ],
65
- "Operating System": [
66
- "ოპერაციული სისტემა"
44
+ "Environment only": [
45
+ "მხოლოდ გარემო"
67
46
  ],
68
47
  "Operating system default": [
69
48
  "ოპერაციული სისტემის ნაგულისხმები მნიშვნელობა"
70
49
  ],
71
- "RHEV integration is deprecated.": [
72
- "RHEV-ის ჩაშენება მოძველებულია."
73
- ],
74
- "Red Hat Satellite Blog": [
75
- "Red Hat Satellite-ის ბლოგი"
76
- ],
77
- "Satellite ticketing system": [
78
- "Satellite-ის ბილეთებს სისტემა"
50
+ "The final entry, Operating System default, can be set by editing the %s page.": [
51
+ "საბოლოო ჩანაწერი, ოპერაციული სისტემის ნაგულისხმები, შეიძლება დაყენდეს %s გვერდის რედაქტირებით."
79
52
  ],
80
- "Show unsupported provisioning templates": [
81
- "მხარდაუჭერელი გაშლის ნიმუშების ჩვენება"
53
+ "Operating System": [
54
+ "ოპერაციული სისტემა"
82
55
  ],
83
- "Show unsupported provisioning templates. When enabled, all the avaiable templates will be shown. When disabled, Red Hat supported templates will be shown only": [
84
- "მხარდაუჭერელი გაშლის ნიმუშების ჩვენება. როცა ჩართულია, ნაჩვენები იქნება ყველა ხელმისაწვდომი ნიმუში. როცა გამორთულია, ნაჩვენები იქნება, მხოლოდ, Red Hat-ის მიერ მხარდაჭერილი ნმუშები"
56
+ "Version %{version}": [
57
+ "ვერსია %{version}"
85
58
  ],
86
59
  "Support": [
87
60
  "მხარდაჭერა"
88
61
  ],
89
- "Supported by Red Hat": [
90
- "მხარდაჭერილია Red Hat-ის მიერ"
62
+ "Customer portal": [
63
+ "მომხმარებლის პორტალი"
91
64
  ],
92
- "The final entry, Operating System default, can be set by editing the %s page.": [
93
- "საბოლოო ჩანაწერი, ოპერაციული სისტემის ნაგულისხმები, შეიძლება დაყენდეს %s გვერდის რედაქტირებით."
65
+ "Documentation": [
66
+ "დოკუმენტაცია"
94
67
  ],
95
- "Theme changes for Satellite 6.": [
96
- "თემის ცვლილებები Satellite 6-სთვის."
68
+ "Administering Red Hat Satellite": [
69
+ "Red Hat Satellite-ის ადმინისტრირება"
97
70
  ],
98
71
  "Transitioning from Red Hat Satellite 5 to Red Hat Satellite 6": [
99
72
  "გადასვლა Red Hat Satellite 5-დან to Red Hat Satellite 6-ზე"
100
73
  ],
101
- "Version %{version}": [
102
- "ვერსია %{version}"
74
+ "API Guide": [
75
+ "API-ის გიდი"
103
76
  ],
104
- "Version %{version} © %{year} Red Hat Inc.": [
105
- "ვერსია %{version} © %{year} Red Hat Inc."
77
+ "Blog": [
78
+ "ბლოგი"
106
79
  ],
107
- "When a Host requests a template (e.g. during provisioning), Foreman selects the optimal match from the available templates of that type, in the following order:": [
108
- "როდესაც ჰოსტი მოითხოვს შაბლონს (მაგ. სამუშაოდ მომზადების დროს), Foreman საუკეთესო შესატყვისს ამ ტიპის არსებული შაბლონებიდან შემდეგი თანამიმდევრობით შეარჩევს:"
80
+ "Red Hat Satellite Blog": [
81
+ "Red Hat Satellite-ის ბლოგი"
109
82
  ],
110
- "When editing a Template, you must assign a list of Operating Systems with which this Template can be used. Optionally, you can restrict a template to a list of Hostgroups or Environments.": [
111
- "შაბლონის რედაქტირებისას თქვენ უნდა მიანიჭოთ სია ოპერაციული სისტემებისა, რომლებთანაც შესაძლებელია ამ შაბლონის გამოყენება. სურვილისამებრ, შეგიძლიათ, შაბლონი ჰოსტების ჯგუფების სიით ან/და გარემოებით შეზღუდოთ."
83
+ "IRC": [
84
+ "IRC"
112
85
  ],
113
86
  "You can find us on %{liberachat} (irc.libera.chat) in #redhat-satellite.": [
114
87
  "%{liberachat}-ზე (irc.libera.chat) ჩვენი პოვნა #redhat-satellite არხზე შეგიძლიათ."
115
88
  ],
89
+ "Version %{version} © %{year} Red Hat Inc.": [
90
+ "ვერსია %{version} © %{year} Red Hat Inc."
91
+ ],
92
+ "Includes %{system} © 2009-%{year} Paul Kelly and Ohad Levy": [
93
+ "შეიცავს %{system} © 2009-%{year} პოლ კელი და ოჰედ ლევი"
94
+ ],
95
+ "If you feel this is an error with Satellite 6 itself, please open a new issue with": [
96
+ "თუ გგონიათ, რომ ეს შეცდომა Satellite 6-ის შეცდომაა, გახსენით ახალი ბილეთი"
97
+ ],
98
+ "Satellite ticketing system": [
99
+ "Satellite-ის ბილეთებს სისტემა"
100
+ ],
116
101
  "You would probably need to attach the": [
117
102
  "ალბათ, დაგჭირდებათ მიამაგროთ"
118
103
  ],
104
+ "Full trace": [
105
+ "სრული ტრეისი"
106
+ ],
119
107
  "and relevant log entries.": [
120
108
  "და შესაბამისი ჟურნალის ჩანაწერები."
109
+ ],
110
+ "(build: %{version})": [
111
+ "(აგება: %{version})"
112
+ ],
113
+ "Show unsupported provisioning templates. When enabled, all the avaiable templates will be shown. When disabled, Red Hat supported templates will be shown only": [
114
+ "მხარდაუჭერელი გაშლის ნიმუშების ჩვენება. როცა ჩართულია, ნაჩვენები იქნება ყველა ხელმისაწვდომი ნიმუში. როცა გამორთულია, ნაჩვენები იქნება, მხოლოდ, Red Hat-ის მიერ მხარდაჭერილი ნმუშები"
115
+ ],
116
+ "Show unsupported provisioning templates": [
117
+ "მხარდაუჭერელი გაშლის ნიმუშების ჩვენება"
118
+ ],
119
+ "Theme changes for Satellite 6.": [
120
+ "თემის ცვლილებები Satellite 6-სთვის."
121
121
  ]
122
122
  }
123
123
  }
@@ -1,4 +1,4 @@
1
- <% require_relative '../../../lib/foreman_theme_satellite/branded_words' %>
1
+ <% require_relative '../../../lib/foreman_theme_satellite/foreman_brand' %>
2
2
 
3
3
  var branded_words = []
4
4
  <% ForemanThemeSatellite::FOREMAN_BRAND.map do |exp, replace| %>
@@ -31,43 +31,33 @@ tfm.i18n.jed.dcnpgettext = function( domain, context, singular_key, plural_key,
31
31
  return brand_string(translated);
32
32
  }
33
33
 
34
- document.addEventListener("loadAngularJSi18n", function () {
35
- if (typeof angular !== "undefined") {
36
- angular.module("Bastion.i18n").config([
37
- "$provide",
38
- function ($provide) {
39
- $provide.decorator("translate", [
40
- "$delegate",
41
- function ($delegate) {
42
- var originalTranslate = $delegate;
43
- return function (str) {
44
- originalStr = originalTranslate(str);
45
- return brand_string(originalStr);
46
- };
47
- },
48
- ]);
49
- },
34
+ if (typeof(angular) !== 'undefined') {
35
+ angular.module('Bastion.i18n').config([ '$provide', function($provide) {
36
+ $provide.decorator('translate', [
37
+ '$delegate',
38
+ function ($delegate) {
39
+ var originalTranslate = $delegate;
40
+ return function(str) {
41
+ originalStr = originalTranslate(str);
42
+ return brand_string(originalStr);
43
+ }
44
+ }
50
45
  ]);
51
- }
52
- });
46
+ }]);
47
+ }
53
48
 
54
- document.addEventListener("loadAngularJSgettext", function () {
55
- if (typeof angular !== "undefined") {
56
- angular.module("gettext").config([
57
- "$provide",
58
- function ($provide) {
59
- $provide.decorator("gettextCatalog", [
60
- "$delegate",
61
- function ($delegate) {
62
- var originalTranslate = $delegate.getString;
63
- $delegate.getString = function (str) {
64
- originalStr = originalTranslate.apply($delegate, [str]);
65
- return brand_string(originalStr);
66
- };
67
- return $delegate;
68
- },
69
- ]);
70
- },
49
+ if (typeof(angular) !== 'undefined') {
50
+ angular.module('gettext').config([ '$provide', function($provide) {
51
+ $provide.decorator('gettextCatalog', [
52
+ '$delegate',
53
+ function ($delegate) {
54
+ var originalTranslate = $delegate.getString;
55
+ $delegate.getString = function(str) {
56
+ originalStr = originalTranslate.apply($delegate, [str]);
57
+ return brand_string(originalStr);
58
+ }
59
+ return $delegate;
60
+ }
71
61
  ]);
72
- }
73
- });
62
+ }]);
63
+ }
@@ -1,4 +1,4 @@
1
- class ChangeBlogUrl < ActiveRecord::Migration[5.1]
1
+ class ChangeBlogURL < ActiveRecord::Migration[5.1]
2
2
  def up
3
3
  if Setting[:rss_url] == 'https://access.redhat.com/blogs/1169563/feed'
4
4
  Setting[:rss_url] = 'https://www.redhat.com/en/rss/blog/channel/red-hat-satellite'
@@ -30,7 +30,7 @@ module ForemanThemeSatellite
30
30
  'Networking' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/configuring_networking_provisioning#Adding_a_Subnet_to_Server_provisioning",
31
31
 
32
32
  # Puppet Guide
33
- 'FactsandtheENC' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/introducing-configuration-management-by-using-puppet#performing-configuration-management_managing-configurations-puppet",
33
+ 'FactsandtheENC' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/introducing-configuration-management-using-puppet_managing-configurations-puppet#performing-configuration-management_managing-configurations-puppet",
34
34
  'using-config-groups' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/creating-a-puppet-config-group_managing-configurations-puppet",
35
35
  'SmartMatchers' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
36
36
  'Parameters' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
@@ -41,11 +41,11 @@ module ForemanThemeSatellite
41
41
  'ConfigurationOptions' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/",
42
42
  'PuppetReports' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/monitoring_resources_admin#Using_the_Project_Content_Dashboard_admin",
43
43
  'Mail_Notifications' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/configuring_email_notifications_admin",
44
- 'Realm' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring-external-services#configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm_satellite",
44
+ 'Realm' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite#configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm_satellite",
45
45
  'Searching' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/searching_and_bookmarking_admin",
46
46
  'RolesandPermissions' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/managing_users_and_roles_admin",
47
- 'LDAPAuthentication' => "#{ForemanThemeSatellite.documentation_root}/configuring_authentication_for_red_hat_satellite_users/configuring-an-ldap-server-as-an-external-identity-provider-for-project_authentication",
48
- 'ExternalAuthentication' => "#{ForemanThemeSatellite.documentation_root}/configuring_authentication_for_red_hat_satellite_users/",
47
+ 'LDAPAuthentication' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite#Using_LDAP_satellite",
48
+ 'ExternalAuthentication' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite",
49
49
  'Bookmarks' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/searching_and_bookmarking_admin",
50
50
  'Policydeploymentoptions' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/compliance-policy-deployment-options_security-compliance",
51
51
  'CreatingSCAPcontent' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/configuring_scap_contents_security-compliance",
@@ -6,21 +6,11 @@ require 'deface'
6
6
  module ForemanThemeSatellite
7
7
  class Engine < ::Rails::Engine
8
8
  engine_name 'foreman_theme_satellite'
9
-
10
- config.eager_load_paths += Dir["#{config.root}/app/overrides"]
11
- config.eager_load_paths += Dir["#{config.root}/app/controllers/concerns"]
12
- config.eager_load_paths += Dir["#{config.root}/app/helpers"]
13
- config.eager_load_paths += Dir["#{config.root}/app/models/concerns"]
14
- config.eager_load_paths += Dir["#{config.root}/app/services/concerns"]
15
- config.eager_load_paths += Dir["#{config.root}/lib/foreman_theme_satellite"]
16
-
17
- initializer 'foreman_theme_satellite.load_default_settings', :before => :load_config_initializers do |app|
18
- SettingRegistry.prepend SettingRegistryBranding
19
- end
9
+ config.eager_load_paths += Dir["#{config.root}/lib"]
20
10
 
21
11
  initializer 'foreman_theme_satellite.register_plugin', :before=> :finisher_hook do |app|
22
12
  Foreman::Plugin.register :foreman_theme_satellite do
23
- requires_foreman '>= 3.7.0'
13
+ requires_foreman '>= 3.13.0'
24
14
  register_gettext
25
15
 
26
16
  settings do
@@ -36,7 +26,7 @@ module ForemanThemeSatellite
36
26
  end
37
27
  end
38
28
 
39
- tests_to_skip ({
29
+ tests_to_skip ({
40
30
  "ComputeResourceTest" => ["friendly provider name"],
41
31
  "RealmIntegrationTest" => ["create new page"],
42
32
  "SmartProxyIntegrationTest" => ["create new page", "index page"],
@@ -49,7 +39,7 @@ module ForemanThemeSatellite
49
39
  "OrganizationTest" => ["should clone organization with all associations"],
50
40
  "RealmTest" => ["realm can be assigned to locations"],
51
41
  "LocationTest" => ["should clone location with all associations"]
52
- })
42
+ })
53
43
 
54
44
  extend_rabl_template 'api/v2/home/status', 'api/v2/home/status_extensions'
55
45
  extend_template_helpers ForemanThemeSatellite::RendererMethods
@@ -69,19 +59,12 @@ module ForemanThemeSatellite
69
59
  end
70
60
  end
71
61
 
72
- initializer 'foreman_theme_satellite.rails_loading_workaround' do
73
- # Without this, in production environment the module gets prepended too
74
- # late and the extensions do not get applied
75
- # the idea is stolen from https://github.com/theforeman/foreman_remote_execution/commit/2efd0a6eccfc19e282f453d5629cf46e729963eb
76
- ProvisioningTemplatesHelper.prepend ProvisioningTemplatesHelperBranding
77
- end
78
-
79
62
  # Include concerns in this config.to_prepare block
80
63
  config.to_prepare do
81
64
  begin
65
+ SettingRegistry.prepend SettingRegistryBranding
82
66
  # Include your monkey-patches over here
83
67
  ::ForemanGoogle::GCE.send(:prepend, GCE::ClassMethods) if Foreman::Plugin.installed?("foreman_google")
84
- require 'rss_checker_branding'
85
68
  UINotifications::RssNotificationsChecker.send :prepend, RssCheckerBranding
86
69
  Foreman::Model::Openstack.send :include, Openstack
87
70
  Foreman::Model::Ovirt.send :include, Ovirt
@@ -7,13 +7,15 @@ module ForemanThemeSatellite
7
7
  # For now, modifiers are not supported by the generator.
8
8
  # Make sure the regexp works both with Ruby and JavaScript.
9
9
  # Entries are processed in order and first wins.
10
+ # Occurrences of "proxy" should be treated as a bug as it is unclear whether the author refers to a HTTP(S) proxy or a Capsule
10
11
  FOREMAN_BRAND = {
11
12
  /%{proxy}/ => '%{proxy}',
12
13
  /%{foreman}/ => '%{foreman}',
13
14
  /\b[Pp]roxy [Hh][Tt][Tt][Pp]\b(?!-)/ => 'Proxy HTTP', # Workaround for French translation
14
15
  /\b[Pp]roxies [Hh][Tt][Tt][Pp]\b(?!-)/ => 'Proxies HTTP', # Workaround for French translation
15
- /\b[Hh][Tt][Tt][Pp] [Pp]roxy\b(?!-)/ => 'HTTP Proxy',
16
- /\b[Hh][Tt][Tt][Pp] [Pp]roxies\b(?!-)/ => 'HTTP Proxies',
16
+ ## BEGIN Remove after imprecise strings have been fixed in core
17
+ /\b[Hh][Tt][Tt][Pp](?:\([sS]\))? [Pp]roxy\b(?!-)/ => 'HTTP proxy',
18
+ /\b[Hh][Tt][Tt][Pp](?:\([sS]\))? [Pp]roxies\b(?!-)/ => 'HTTP proxies',
17
19
  /\bHTTP\(S\) proxy\b(?!-)/ => 'HTTP(S) proxy',
18
20
  /\bIgnore Proxy\b(?!-)/ => 'Ignore Proxy',
19
21
  /\bIgnore proxy\b(?!-)/ => 'Ignore Proxy',
@@ -24,33 +26,16 @@ module ForemanThemeSatellite
24
26
  %r{\bhttps://proxy.example.com:8080\b(?!-)} => 'https://proxy.example.com:8080',
25
27
  /\bproxy for all outgoing HTTP connections\b(?!-)/ => 'proxy for all outgoing HTTP connections',
26
28
  /\bperform various actions through those proxies\b(?!-)/ => 'perform various actions through those proxies',
27
- /\bForeman\b(?!-)/ => 'Satellite',
28
- /\bforeman\b(?!-)/ => 'satellite',
29
- /\bsmart-proxy\b(?!-)/ => 'capsule',
30
- /\bSmart-proxy\b(?!-)/ => 'Capsule',
31
- /\bsmart proxies\b(?!-)/ => 'capsules',
32
- /\bSmart proxies\b(?!-)/ => 'Capsules',
33
- /\bsmart-proxies\b(?!-)/ => 'capsules',
34
- /\bSmart-proxies\b(?!-)/ => 'Capsules',
35
- /\bSmart Proxies\b(?!-)/ => 'Capsules',
36
- /\bSmart Proxy\(ies\)(?!-)/ => 'Capsule(s)',
37
- /\bSmart Proxy\b(?!-)/ => 'Capsule',
38
- /\bsmart proxy\b(?!-)/ => 'capsule',
39
- /\bSmart-Proxies\b(?!-)/ => 'Capsules',
40
- /\bSmart proxy\b(?!-)/ => 'Capsule',
41
- /\bSmart-Proxy\b(?!-)/ => 'Capsule',
42
- /\boVirt\b(?!-)/ => 'RHEV',
43
- /\bovirt\b(?!-)/ => 'RHEV',
44
- /\bOvirt\b(?!-)/ => 'RHEV',
45
- /\bFreeIPA\b(?!-)/ => 'Red Hat Identity Management',
46
- /\bOpenStack\b(?!-)/ => 'RHEL OpenStack Platform',
47
- /\bopenstack\b(?!-)/ => 'RHEL OpenStack Platform',
48
- /\bOpenstack\b(?!-)/ => 'RHEL OpenStack Platform',
49
- /\bProxy\b(?!-)/ => 'Capsule',
50
- /\bproxy\b(?!-)/ => 'Capsule',
51
- /\bProxies\b(?!-)/ => 'Capsules',
52
- /\bproxies\b(?!-)/ => 'Capsules',
53
- /\b[Kk]atello 4.0\b(?!-)/ => 'Satellite 6.11',
29
+ ## END
30
+ /\b[Ff]oreman\b(?!-)/ => 'Satellite',
31
+ /\b[Ss]mart[- ]?[pP]roxy\b(?!-)/ => 'Capsule',
32
+ /\b[Ss]mart[- ]?[pP]roxies\b(?!-)/ => 'Capsules',
33
+ /\b[Pp]roxy\b(?!-)/ => 'Capsule',
34
+ /\b[Pp]roxies\b(?!-)/ => 'Capsules',
35
+ /\b[Oo][Vv]irt\b(?!-)/ => 'RHV',
36
+ /\bFreeIPA\b(?!-)/ => 'Red Hat Identity Management',
37
+ /\b[Oo]pen[Ss]tack\b(?!-)/ => 'Red Hat OpenStack Platform',
38
+ /\b[Kk]atello 4.0\b(?!-)/ => 'Satellite 6.11',
54
39
  /\b[Kk]atello 4.10\b(?!-)/ => 'Satellite 6.15',
55
40
  /\b[Kk]atello 4.11\b(?!-)/ => 'Satellite 6.15',
56
41
  /\b[Kk]atello 4.12\b(?!-)/ => 'Satellite 6.16',
@@ -1,5 +1,4 @@
1
1
  require 'fast_gettext'
2
- require_relative 'branded_words'
3
2
 
4
3
  module ForemanThemeSatellite
5
4
  # This repository is a wrapper above other repository,
@@ -1,3 +1,3 @@
1
1
  module ForemanThemeSatellite
2
- VERSION = '13.3.2'.freeze
2
+ VERSION = '14.0.0'.freeze
3
3
  end
data/locale/Makefile CHANGED
@@ -31,16 +31,9 @@ all-mo: $(MOFILES)
31
31
  cat $@
32
32
  ! grep -q msgid $@
33
33
 
34
- %.edit.po: %.po.time_stamp
34
+ %.edit.po:
35
35
  touch $@
36
36
 
37
- # gettext will trash the .edit.po file if the time stamp doesn't exist or is older than the po file
38
- %.po.time_stamp: %.po
39
- touch --reference $< $@
40
-
41
- # Prevent make from treating this as an intermediate file to be cleaned up
42
- .PRECIOUS: %.po.time_stamp
43
-
44
37
  check: $(POXFILES)
45
38
 
46
39
  # Unify duplicate translations
@@ -50,10 +43,7 @@ uniq-po:
50
43
  done
51
44
 
52
45
  tx-pull: $(EDITFILES)
53
- # Initialize new languages
54
- cd .. && tx pull -f --all --minimum-perc 50
55
- # Force update all existing languages
56
- cd .. && tx pull -f --minimum-perc 0
46
+ cd .. && tx pull -f --all
57
47
  for f in $(EDITFILES) ; do \
58
48
  sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
59
49
  done
@@ -8,7 +8,7 @@
8
8
  #
9
9
  msgid ""
10
10
  msgstr ""
11
- "Project-Id-Version: foreman_theme_satellite 14.0.1\n"
11
+ "Project-Id-Version: foreman_theme_satellite 13.2.0\n"
12
12
  "Report-Msgid-Bugs-To: \n"
13
13
  "PO-Revision-Date: 2023-11-21 10:43+0000\n"
14
14
  "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2023\n"
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "foreman_theme_satellite",
3
- "version": "13.3.2",
3
+ "version": "14.0.0",
4
4
  "description": "Satellite theme =============",
5
5
  "main": "index.js",
6
6
  "scripts": {
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_theme_satellite
3
3
  version: !ruby/object:Gem::Version
4
- version: 13.3.2
4
+ version: 14.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Shimon Stein
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2024-09-27 00:00:00.000000000 Z
12
+ date: 2024-09-11 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
@@ -83,12 +83,7 @@ files:
83
83
  - app/assets/images/foreman_theme_satellite/login_bg.svg
84
84
  - app/assets/images/foreman_theme_satellite/login_logo.svg
85
85
  - app/assets/images/foreman_theme_satellite/supported_icon.png
86
- - app/assets/javascripts/foreman_theme_satellite/locale/es/foreman_theme_satellite.js
87
- - app/assets/javascripts/foreman_theme_satellite/locale/fr/foreman_theme_satellite.js
88
- - app/assets/javascripts/foreman_theme_satellite/locale/ja/foreman_theme_satellite.js
89
86
  - app/assets/javascripts/foreman_theme_satellite/locale/ka/foreman_theme_satellite.js
90
- - app/assets/javascripts/foreman_theme_satellite/locale/pt_BR/foreman_theme_satellite.js
91
- - app/assets/javascripts/foreman_theme_satellite/locale/zh_CN/foreman_theme_satellite.js
92
87
  - app/assets/javascripts/foreman_theme_satellite/theme_dashboard.js
93
88
  - app/assets/javascripts/foreman_theme_satellite/theme_ng_page_title.js
94
89
  - app/assets/stylesheets/foreman_theme_satellite/application_colors.css
@@ -145,10 +140,10 @@ files:
145
140
  - db/seeds.d/069-provisioning_templates_defaults.rb
146
141
  - db/seeds.d/850-global_parameters.rb
147
142
  - lib/foreman_theme_satellite.rb
148
- - lib/foreman_theme_satellite/branded_words.rb
149
143
  - lib/foreman_theme_satellite/deprecated_templates.rb
150
144
  - lib/foreman_theme_satellite/documentation.rb
151
145
  - lib/foreman_theme_satellite/engine.rb
146
+ - lib/foreman_theme_satellite/foreman_brand.rb
152
147
  - lib/foreman_theme_satellite/pry_rack.rb
153
148
  - lib/foreman_theme_satellite/replacer_repository.rb
154
149
  - lib/foreman_theme_satellite/rss_checker_branding.rb
@@ -158,20 +153,10 @@ files:
158
153
  - lib/generators/foreman_theme_satellite/lib/css_compare.rb
159
154
  - lib/tasks/foreman_theme_satellite_tasks.rake
160
155
  - locale/Makefile
161
- - locale/es/LC_MESSAGES/foreman_theme_satellite.mo
162
- - locale/es/foreman_theme_satellite.po
163
156
  - locale/foreman_theme_satellite.pot
164
- - locale/fr/LC_MESSAGES/foreman_theme_satellite.mo
165
- - locale/fr/foreman_theme_satellite.po
166
157
  - locale/gemspec.rb
167
- - locale/ja/LC_MESSAGES/foreman_theme_satellite.mo
168
- - locale/ja/foreman_theme_satellite.po
169
158
  - locale/ka/LC_MESSAGES/foreman_theme_satellite.mo
170
159
  - locale/ka/foreman_theme_satellite.po
171
- - locale/pt_BR/LC_MESSAGES/foreman_theme_satellite.mo
172
- - locale/pt_BR/foreman_theme_satellite.po
173
- - locale/zh_CN/LC_MESSAGES/foreman_theme_satellite.mo
174
- - locale/zh_CN/foreman_theme_satellite.po
175
160
  - package.json
176
161
  - webpack/index.js
177
162
  homepage: https://github.com/RedHatSatellite/foreman_theme_satellite
@@ -194,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
194
179
  - !ruby/object:Gem::Version
195
180
  version: '0'
196
181
  requirements: []
197
- rubygems_version: 3.5.16
182
+ rubygems_version: 3.5.11
198
183
  signing_key:
199
184
  specification_version: 4
200
185
  summary: This is a plugin that enables building a theme for Foreman.