foreman_theme_satellite 13.2.5 → 13.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (33) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/app/assets/javascripts/foreman_theme_satellite/locale/es/foreman_theme_satellite.js +124 -0
  4. data/app/assets/javascripts/foreman_theme_satellite/locale/fr/foreman_theme_satellite.js +124 -0
  5. data/app/assets/javascripts/foreman_theme_satellite/locale/ja/foreman_theme_satellite.js +124 -0
  6. data/app/assets/javascripts/foreman_theme_satellite/locale/ka/foreman_theme_satellite.js +62 -62
  7. data/app/assets/javascripts/foreman_theme_satellite/locale/pt_BR/foreman_theme_satellite.js +124 -0
  8. data/app/assets/javascripts/foreman_theme_satellite/locale/zh_CN/foreman_theme_satellite.js +124 -0
  9. data/app/controllers/concerns/documentation_controller_branding.rb +5 -7
  10. data/app/helpers/theme_application_helper.rb +1 -1
  11. data/app/overrides/satellite_name_override.rb +1 -1
  12. data/app/views/foreman_theme_satellite/_theme_client_side_branding.js.erb +37 -27
  13. data/db/migrate/20180605150932_deprecate_satellite_templates.rb +4 -0
  14. data/lib/foreman_theme_satellite/branded_words.rb +2 -1
  15. data/lib/foreman_theme_satellite/documentation.rb +21 -21
  16. data/lib/foreman_theme_satellite/engine.rb +1 -1
  17. data/lib/foreman_theme_satellite/version.rb +1 -1
  18. data/lib/tasks/foreman_theme_satellite_tasks.rake +0 -21
  19. data/locale/Makefile +12 -2
  20. data/locale/es/LC_MESSAGES/foreman_theme_satellite.mo +0 -0
  21. data/locale/es/foreman_theme_satellite.po +126 -0
  22. data/locale/fr/LC_MESSAGES/foreman_theme_satellite.mo +0 -0
  23. data/locale/fr/foreman_theme_satellite.po +127 -0
  24. data/locale/ja/LC_MESSAGES/foreman_theme_satellite.mo +0 -0
  25. data/locale/ja/foreman_theme_satellite.po +123 -0
  26. data/locale/ka/LC_MESSAGES/foreman_theme_satellite.mo +0 -0
  27. data/locale/ka/foreman_theme_satellite.po +1 -1
  28. data/locale/pt_BR/LC_MESSAGES/foreman_theme_satellite.mo +0 -0
  29. data/locale/pt_BR/foreman_theme_satellite.po +128 -0
  30. data/locale/zh_CN/LC_MESSAGES/foreman_theme_satellite.mo +0 -0
  31. data/locale/zh_CN/foreman_theme_satellite.po +126 -0
  32. data/package.json +1 -1
  33. metadata +23 -50
@@ -0,0 +1,124 @@
1
+ locales['foreman_theme_satellite'] = locales['foreman_theme_satellite'] || {}; locales['foreman_theme_satellite']['pt_BR'] = {
2
+ "domain": "foreman_theme_satellite",
3
+ "locale_data": {
4
+ "foreman_theme_satellite": {
5
+ "": {
6
+ "Project-Id-Version": "foreman_theme_satellite 1.0.0",
7
+ "Report-Msgid-Bugs-To": "",
8
+ "PO-Revision-Date": "2023-11-21 10:43+0000",
9
+ "Last-Translator": "Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2024",
10
+ "Language-Team": "Portuguese (Brazil) (https://app.transifex.com/foreman/teams/114/pt_BR/)",
11
+ "MIME-Version": "1.0",
12
+ "Content-Type": "text/plain; charset=UTF-8",
13
+ "Content-Transfer-Encoding": "8bit",
14
+ "Language": "pt_BR",
15
+ "Plural-Forms": "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;",
16
+ "lang": "pt_BR",
17
+ "domain": "foreman_theme_satellite",
18
+ "plural_forms": "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
19
+ },
20
+ "(build: %{version})": [
21
+ ""
22
+ ],
23
+ "API Guide": [
24
+ "Guia de API"
25
+ ],
26
+ "Administering Red Hat Satellite": [
27
+ ""
28
+ ],
29
+ "Blog": [
30
+ "Blog"
31
+ ],
32
+ "Customer portal": [
33
+ "Portal do Consumidor"
34
+ ],
35
+ "Documentation": [
36
+ "Documentação"
37
+ ],
38
+ "Environment only": [
39
+ "Somente ambiente"
40
+ ],
41
+ "Full trace": [
42
+ "Trace completo"
43
+ ],
44
+ "Host group and Environment": [
45
+ "Grupo de hosts e ambiente"
46
+ ],
47
+ "Host group only": [
48
+ "Somente grupo de hosts"
49
+ ],
50
+ "IRC": [
51
+ "IRC"
52
+ ],
53
+ "If you feel this is an error with Satellite 6 itself, please open a new issue with": [
54
+ "Se você acha que isso é um erro com o próprio Satellite 6, por favor, abra um novo problema com "
55
+ ],
56
+ "Includes %{system} © 2009-%{year} Paul Kelly and Ohad Levy": [
57
+ ""
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
+ ""
64
+ ],
65
+ "Operating System": [
66
+ "Sistema Operacional"
67
+ ],
68
+ "Operating system default": [
69
+ "Sistema operacional padrão"
70
+ ],
71
+ "RHEV integration is deprecated.": [
72
+ ""
73
+ ],
74
+ "Red Hat Satellite Blog": [
75
+ "Red Hat Satellite Blog"
76
+ ],
77
+ "Satellite ticketing system": [
78
+ "Sistema de bilhete do Satellite"
79
+ ],
80
+ "Show unsupported provisioning templates": [
81
+ ""
82
+ ],
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
+ ""
85
+ ],
86
+ "Support": [
87
+ "Suporte"
88
+ ],
89
+ "Supported by Red Hat": [
90
+ ""
91
+ ],
92
+ "The final entry, Operating System default, can be set by editing the %s page.": [
93
+ "A entrada final, padrão do Sistema Operacional, pode ser definida editando a página %s."
94
+ ],
95
+ "Theme changes for Satellite 6.": [
96
+ "Alterações de tema para o Satellite 6."
97
+ ],
98
+ "Transitioning from Red Hat Satellite 5 to Red Hat Satellite 6": [
99
+ ""
100
+ ],
101
+ "Version %{version}": [
102
+ ""
103
+ ],
104
+ "Version %{version} © %{year} Red Hat Inc.": [
105
+ ""
106
+ ],
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
+ "Quando um host solicita um modelo (por exemplo, durante o provisionamento), o Foreman seleciona a correspondência ideal dos modelos disponíveis daquele tipo, na seguinte ordem:"
109
+ ],
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
+ "Ao editar um modelo, você deve atribuir uma lista de sistemas operacionais com os quais o modelo pode ser usado. Opcionalmente, você pode restringir um modelo a uma lista de grupos de hosts ou ambientes."
112
+ ],
113
+ "You can find us on %{liberachat} (irc.libera.chat) in #redhat-satellite.": [
114
+ ""
115
+ ],
116
+ "You would probably need to attach the": [
117
+ "você provavelmente precise anexar o"
118
+ ],
119
+ "and relevant log entries.": [
120
+ "e entradas de log relevantes."
121
+ ]
122
+ }
123
+ }
124
+ };
@@ -0,0 +1,124 @@
1
+ locales['foreman_theme_satellite'] = locales['foreman_theme_satellite'] || {}; locales['foreman_theme_satellite']['zh_CN'] = {
2
+ "domain": "foreman_theme_satellite",
3
+ "locale_data": {
4
+ "foreman_theme_satellite": {
5
+ "": {
6
+ "Project-Id-Version": "foreman_theme_satellite 1.0.0",
7
+ "Report-Msgid-Bugs-To": "",
8
+ "PO-Revision-Date": "2023-11-21 10:43+0000",
9
+ "Last-Translator": "Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2024",
10
+ "Language-Team": "Chinese (China) (https://app.transifex.com/foreman/teams/114/zh_CN/)",
11
+ "MIME-Version": "1.0",
12
+ "Content-Type": "text/plain; charset=UTF-8",
13
+ "Content-Transfer-Encoding": "8bit",
14
+ "Language": "zh_CN",
15
+ "Plural-Forms": "nplurals=1; plural=0;",
16
+ "lang": "zh_CN",
17
+ "domain": "foreman_theme_satellite",
18
+ "plural_forms": "nplurals=1; plural=0;"
19
+ },
20
+ "(build: %{version})": [
21
+ "(构建:%{version})"
22
+ ],
23
+ "API Guide": [
24
+ "API 指南"
25
+ ],
26
+ "Administering Red Hat Satellite": [
27
+ "管理 Red Hat Satellite"
28
+ ],
29
+ "Blog": [
30
+ "部落格"
31
+ ],
32
+ "Customer portal": [
33
+ "客户门户"
34
+ ],
35
+ "Documentation": [
36
+ "文档"
37
+ ],
38
+ "Environment only": [
39
+ "仅环境"
40
+ ],
41
+ "Full trace": [
42
+ "完整追蹤"
43
+ ],
44
+ "Host group and Environment": [
45
+ "主机组和环境"
46
+ ],
47
+ "Host group only": [
48
+ "仅主机组"
49
+ ],
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} Paul Kelly 和 Ohad Levy"
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 年 8 月 31 日,Red Hat Virtualization 进入维护支持阶段。维护支持阶段持续到 2024 年 8 月 31 日,然后进入延长生命周期阶段,它会持续到 2026 年 8 月 31 日。"
64
+ ],
65
+ "Operating System": [
66
+ "操作系统"
67
+ ],
68
+ "Operating system default": [
69
+ "作業系統預設值"
70
+ ],
71
+ "RHEV integration is deprecated.": [
72
+ "RHEV 集成已弃用。"
73
+ ],
74
+ "Red Hat Satellite Blog": [
75
+ "Red Hat Satellite 部落格"
76
+ ],
77
+ "Satellite ticketing system": [
78
+ "Satellite 的票證系統"
79
+ ],
80
+ "Show unsupported provisioning templates": [
81
+ "显示不被支持的置备模板"
82
+ ],
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
+ "显示不支持的置备模板。启用后,将显示所有可查询的模板。禁用时,仅显示红帽支持的模板"
85
+ ],
86
+ "Support": [
87
+ "支援"
88
+ ],
89
+ "Supported by Red Hat": [
90
+ "被红帽支持"
91
+ ],
92
+ "The final entry, Operating System default, can be set by editing the %s page.": [
93
+ "最终条目,操作系统默认值,可以通过编辑 %s 页设置。"
94
+ ],
95
+ "Theme changes for Satellite 6.": [
96
+ "Satellite 6 的主题更改。"
97
+ ],
98
+ "Transitioning from Red Hat Satellite 5 to Red Hat Satellite 6": [
99
+ "从 Red Hat Satellite 5 转换到 Red Hat Satellite 6"
100
+ ],
101
+ "Version %{version}": [
102
+ "版本 %{version}"
103
+ ],
104
+ "Version %{version} © %{year} Red Hat Inc.": [
105
+ "版本 %{version} © %{year} Red Hat Inc。"
106
+ ],
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 按照以下顺序从该类型的可用模板中选择最佳的匹配项:"
109
+ ],
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
+ "在编辑模板时,您必须分配可搭配此模板使用的一系列操作系统。您也可选择将模板限制到一组主机组或环境。"
112
+ ],
113
+ "You can find us on %{liberachat} (irc.libera.chat) in #redhat-satellite.": [
114
+ "您可以在 #redhat-satellite 的 %{liberachat} (irc.libera.chat) 中找到我们。"
115
+ ],
116
+ "You would probably need to attach the": [
117
+ "您可能需要附加"
118
+ ],
119
+ "and relevant log entries.": [
120
+ "和相關的日誌項目。"
121
+ ]
122
+ }
123
+ }
124
+ };
@@ -12,13 +12,11 @@ module DocumentationControllerBranding
12
12
  end
13
13
  if url.empty?
14
14
  upstream_url = super(section, options)
15
- if (upstream_url =~ /redhat.com/)
16
- url = upstream_url
17
- else
18
- special_links_pair = ForemanThemeSatellite::Documentation::SPECIAL_LINKS.find { |regex, _val| regex.match(upstream_url) }
19
- url = special_links_pair[1] if special_links_pair
20
- url = "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite" if url.empty?
21
- end
15
+ url = if (upstream_url =~ /redhat.com/)
16
+ upstream_url
17
+ else
18
+ "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite"
19
+ end
22
20
  end
23
21
  url
24
22
  end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # rubocop:disable Metrics/LineLength
3
+ # rubocop:disable Layout/LineLength
4
4
  # Overrides for functions used in helpers.
5
5
  module ThemeApplicationHelper
6
6
  def association_text()
@@ -37,7 +37,7 @@ Deface::Override.new(:virtual_path => "about/index",
37
37
  :text => " <div class=\"stats-well\"><h4><%= _(\"Support\") %></h4> <p>Visit the <%= link_to _('Customer Portal'), \"https://access.redhat.com/\",
38
38
  :rel => \"external\" %> to get support, find solutions to common questions, and more.</p><h6><%= _(\"Documentation\") %></h6>
39
39
  <ul>
40
- <li><%= link_to _('Complete Product Documentation for Red Hat Satellite'),\"https://access.redhat.com/documentation/en/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}\", :rel => \"external\" %></li>
40
+ <li><%= link_to _('Complete Product Documentation for Red Hat Satellite'),\"#{ForemanThemeSatellite.documentation_server}/documentation/en/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}\", :rel => \"external\" %></li>
41
41
  <li><%= link_to _('API Resources'), apipie_apipie_path, :title => _('Automate Satellite via a simple and powerful API') %></li>
42
42
  <li><%= link_to _('Templates DSL'), apipie_dsl_apipie_dsl_path, :title => _('Get DSL reference for templates writing') %></li>
43
43
  </ul>
@@ -31,33 +31,43 @@ tfm.i18n.jed.dcnpgettext = function( domain, context, singular_key, plural_key,
31
31
  return brand_string(translated);
32
32
  }
33
33
 
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
- }
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
+ },
45
50
  ]);
46
- }]);
47
- }
51
+ }
52
+ });
48
53
 
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
- }
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
+ },
61
71
  ]);
62
- }]);
63
- }
72
+ }
73
+ });
@@ -1,3 +1,5 @@
1
+ # rubocop:disable Rails/SkipsModelValidations
2
+
1
3
  require_relative '../../lib/foreman_theme_satellite/deprecated_templates'
2
4
 
3
5
  class DeprecateSatelliteTemplates < ActiveRecord::Migration[5.1]
@@ -50,3 +52,5 @@ class DeprecateSatelliteTemplates < ActiveRecord::Migration[5.1]
50
52
  destination.operatingsystem_ids = (destination.operatingsystem_ids + source.operatingsystem_ids).uniq
51
53
  end
52
54
  end
55
+
56
+ # rubocop:enable Rails/SkipsModelValidations
@@ -10,6 +10,8 @@ module ForemanThemeSatellite
10
10
  FOREMAN_BRAND = {
11
11
  /%{proxy}/ => '%{proxy}',
12
12
  /%{foreman}/ => '%{foreman}',
13
+ /\b[Pp]roxy [Hh][Tt][Tt][Pp]\b(?!-)/ => 'Proxy HTTP', # Workaround for French translation
14
+ /\b[Pp]roxies [Hh][Tt][Tt][Pp]\b(?!-)/ => 'Proxies HTTP', # Workaround for French translation
13
15
  /\b[Hh][Tt][Tt][Pp] [Pp]roxy\b(?!-)/ => 'HTTP Proxy',
14
16
  /\b[Hh][Tt][Tt][Pp] [Pp]roxies\b(?!-)/ => 'HTTP Proxies',
15
17
  /\bHTTP\(S\) proxy\b(?!-)/ => 'HTTP(S) proxy',
@@ -53,6 +55,5 @@ module ForemanThemeSatellite
53
55
  /\b[Kk]atello 4.11\b(?!-)/ => 'Satellite 6.15',
54
56
  /\b[Kk]atello 4.12\b(?!-)/ => 'Satellite 6.16',
55
57
  /\b[Kk]atello 4.13\b(?!-)/ => 'Satellite 6.16',
56
- %r{https://theforeman.org/plugins/katello/(?!-)} => "https://access.redhat.com/documentation/en-us/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}/html/managing_hosts/registering_hosts#registering-a-host-to-satellite-using-the-bootstrap-script"
57
58
  }.freeze
58
59
  end
@@ -1,13 +1,9 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # rubocop:disable Metrics/LineLength
3
+ # rubocop:disable Layout/LineLength
4
4
  module ForemanThemeSatellite
5
5
  module Documentation
6
6
  USER_GUIDE_DICTIONARY = {
7
- # Ansible
8
- 'ImportingRoles' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Importing_Ansible_Roles_and_Variables_ansible",
9
- 'Variables' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Overriding_Ansible_Variables_in_satellite_ansible",
10
-
11
7
  # Managing Hosts
12
8
  'ForemanRemoteExecution' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/configuring_and_setting_up_remote_jobs_managing-hosts",
13
9
  'ExecutingaJob' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/configuring_and_setting_up_remote_jobs_managing-hosts#Configuring_the_Global_capsule_Remote_Execution_Setting_in_satellite_managing-hosts",
@@ -34,22 +30,22 @@ module ForemanThemeSatellite
34
30
  'Networking' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/configuring_networking_provisioning#Adding_a_Subnet_to_Server_provisioning",
35
31
 
36
32
  # Puppet Guide
37
- 'FactsandtheENC' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/introducing-configuration-management-using-puppet_managing-configurations-puppet#performing-configuration-management_managing-configurations-puppet",
38
- 'using-config-groups' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/creating-a-puppet-config-group_managing-configurations-puppet",
39
- 'SmartMatchers' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
40
- 'Parameters' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
41
- 'Classes' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/importing_puppet_classes_and_environments_managing-configurations-puppet",
42
- 'Environments' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/creating_a_custom_puppet_environment_managing-configurations-puppet",
33
+ 'FactsandtheENC' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/introducing-configuration-management-by-using-puppet#performing-configuration-management_managing-configurations-puppet",
34
+ 'using-config-groups' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/creating-a-puppet-config-group_managing-configurations-puppet",
35
+ 'SmartMatchers' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
36
+ 'Parameters' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
37
+ 'Classes' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/importing_puppet_classes_and_environments_managing-configurations-puppet",
38
+ 'Environments' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/creating_a_custom_puppet_environment_managing-configurations-puppet",
43
39
 
44
40
  # Administering
45
41
  'ConfigurationOptions' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/",
46
42
  'PuppetReports' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/monitoring_resources_admin#Using_the_Project_Content_Dashboard_admin",
47
43
  'Mail_Notifications' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/configuring_email_notifications_admin",
48
- 'Realm' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite#External_Authentication_for_Provisioned_Hosts_satellite",
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",
49
45
  'Searching' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/searching_and_bookmarking_admin",
50
46
  'RolesandPermissions' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/managing_users_and_roles_admin",
51
- 'LDAPAuthentication' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite#Using_LDAP_satellite",
52
- 'ExternalAuthentication' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite",
47
+ 'LDAPAuthentication' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring-external-authentication-and-enabling-single-sign-on-and-two-factor-authentication_satellite#Using_LDAP_satellite",
48
+ 'ExternalAuthentication' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring-external-authentication-and-enabling-single-sign-on-and-two-factor-authentication_satellite",
53
49
  'Bookmarks' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/searching_and_bookmarking_admin",
54
50
  'Policydeploymentoptions' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/compliance-policy-deployment-options_security-compliance",
55
51
  'CreatingSCAPcontent' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/configuring_scap_contents_security-compliance",
@@ -74,16 +70,19 @@ module ForemanThemeSatellite
74
70
 
75
71
  PLUGINS_DOCUMENTATION = {
76
72
  'foreman_azure' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/provisioning_cloud_instances_on_microsoft_azure_resource_manager_azure-provisioning",
77
- 'foreman_discovery' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/configuring_the_discovery_service_provisioning",
73
+ 'foreman_discovery' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/discovering-hosts-on-a-network_provisioning",
78
74
  }.freeze
79
75
 
80
- SPECIAL_LINKS = [
81
- [/docs\.theforeman\.org\/.*?\/Managing_Hosts\/.*?registering-a-host.*?managing-hosts/i, "#{ForemanThemeSatellite.documentation_root}/managing_hosts/registering_hosts_to_server_managing-hosts#Registering_Hosts_by_Using_Global_Registration_managing-hosts"],
82
- ]
83
-
84
76
  DOCS_GUIDES_LINKS = {
77
+ 'Managing_Content' => {
78
+ 'Products_and_Repositories_content-management' => "#{ForemanThemeSatellite.documentation_root}/managing_content/importing_content_content-management#Products_and_Repositories_content-management",
79
+ },
85
80
  'Managing_Hosts' => {
86
81
  'registering-a-host_managing-hosts' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/registering_hosts_to_server_managing-hosts#Registering_Hosts_by_Using_Global_Registration_managing-hosts",
82
+ },
83
+ 'Managing_Configurations_Ansible' => {
84
+ 'Importing_Ansible_Roles_and_Variables_ansible' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Importing_Ansible_Roles_and_Variables_ansible",
85
+ 'Overriding_Ansible_Variables_in_foreman_ansible' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Overriding_Ansible_Variables_in_satellite_ansible",
87
86
  }
88
87
  }.freeze
89
88
 
@@ -96,11 +95,12 @@ module ForemanThemeSatellite
96
95
  source.map do |k, v|
97
96
  key = "#{prefix}/#{k}"
98
97
  if v.is_a?(Hash)
99
- key_values.concat(*nested_to_flat_k_v(key, v))
98
+ key_values.concat(nested_to_flat_k_v(key, v))
100
99
  else
101
- key_values.concat([key, v])
100
+ key_values.concat([[key, v]])
102
101
  end
103
102
  end
103
+ key_values
104
104
  end
105
105
  end
106
106
  end
@@ -139,7 +139,7 @@ module ForemanThemeSatellite
139
139
  end
140
140
 
141
141
  def self.documentation_server
142
- @documentation_server ||= metadata_field('documentation_server', 'https://access.redhat.com')
142
+ @documentation_server ||= metadata_field('documentation_server', 'https://docs.redhat.com')
143
143
  end
144
144
 
145
145
  def self.documentation_version
@@ -1,3 +1,3 @@
1
1
  module ForemanThemeSatellite
2
- VERSION = '13.2.5'.freeze
2
+ VERSION = '13.3.1'.freeze
3
3
  end
@@ -14,21 +14,6 @@ namespace :test do
14
14
  end
15
15
 
16
16
  namespace :foreman_theme_satellite do
17
- task :rubocop do
18
- begin
19
- require 'rubocop/rake_task'
20
- RuboCop::RakeTask.new(:rubocop_foreman_theme_satellite) do |task|
21
- task.patterns = ["#{ForemanThemeSatellite::Engine.root}/app/**/*.rb",
22
- "#{ForemanThemeSatellite::Engine.root}/lib/**/*.rb",
23
- "#{ForemanThemeSatellite::Engine.root}/test/**/*.rb"]
24
- end
25
- rescue
26
- puts 'Rubocop not loaded.'
27
- end
28
-
29
- Rake::Task['rubocop_foreman_theme_satellite'].invoke
30
- end
31
-
32
17
  desc 'Validate documentation links against given TOC file'
33
18
  task :validate_docs do
34
19
  toc_file = ENV['TOC']
@@ -44,7 +29,6 @@ namespace :foreman_theme_satellite do
44
29
 
45
30
  all_links = ForemanThemeSatellite::Documentation::USER_GUIDE_DICTIONARY
46
31
  .merge(ForemanThemeSatellite::Documentation::PLUGINS_DOCUMENTATION)
47
- .merge(Hash[ForemanThemeSatellite::Documentation::SPECIAL_LINKS])
48
32
  .merge(ForemanThemeSatellite::Documentation.flat_docs_guides_links)
49
33
 
50
34
  failed = all_links.filter { |_key, doc_address| doc_address.include?('/html/') && !checker.test_link(doc_address) }
@@ -57,8 +41,3 @@ end
57
41
 
58
42
  Rake::Task[:test].enhance ['test:foreman_theme_satellite']
59
43
  Rake::Task['test:foreman_theme_satellite'].enhance ['foreman_theme_satellite:validate_docs']
60
-
61
- load 'tasks/jenkins.rake'
62
- if Rake::Task.task_defined?(:'jenkins:unit')
63
- Rake::Task['jenkins:unit'].enhance ['test:foreman_theme_satellite', 'foreman_theme_satellite:rubocop']
64
- end
data/locale/Makefile CHANGED
@@ -31,9 +31,16 @@ all-mo: $(MOFILES)
31
31
  cat $@
32
32
  ! grep -q msgid $@
33
33
 
34
- %.edit.po:
34
+ %.edit.po: %.po.time_stamp
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
+
37
44
  check: $(POXFILES)
38
45
 
39
46
  # Unify duplicate translations
@@ -43,7 +50,10 @@ uniq-po:
43
50
  done
44
51
 
45
52
  tx-pull: $(EDITFILES)
46
- cd .. && tx pull -f --all
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
47
57
  for f in $(EDITFILES) ; do \
48
58
  sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
49
59
  done