foreman_templates 9.3.0 → 9.4.0

data/app/assets/javascripts/foreman_templates/locale/sv_SE/foreman_templates.js

@@ -0,0 +1,211 @@
+ locales['foreman_templates'] = locales['foreman_templates'] || {}; locales['foreman_templates']['sv_SE'] = {
+  "domain": "foreman_templates",
+  "locale_data": {
+    "foreman_templates": {
+      "": {
+        "Project-Id-Version": "foreman_templates 9.3.0",
+        "Report-Msgid-Bugs-To": "",
+        "PO-Revision-Date": "2019-10-14 12:27+0000",
+        "Last-Translator": "johnny.westerlund <johnny.westerlund@gmail.com>, 2019",
+        "Language-Team": "Swedish (Sweden) (https://www.transifex.com/foreman/teams/114/sv_SE/)",
+        "MIME-Version": "1.0",
+        "Content-Type": "text/plain; charset=UTF-8",
+        "Content-Transfer-Encoding": "8bit",
+        "Language": "sv_SE",
+        "Plural-Forms": "nplurals=2; plural=(n != 1);",
+        "lang": "sv_SE",
+        "domain": "foreman_templates",
+        "plural_forms": "nplurals=2; plural=(n != 1);"
+      },
+      "Branch in Git repo.": [
+        ""
+      ],
+      "Override the default repo from settings.": [
+        ""
+      ],
+      "Export templates with names matching this regex (case-insensitive; snippets are not filtered).": [
+        ""
+      ],
+      "Negate the prefix (for purging).": [
+        ""
+      ],
+      "The directory within Git repo containing the templates": [
+        ""
+      ],
+      "Initiate Import": [
+        ""
+      ],
+      "The string all imported templates should begin with.": [
+        ""
+      ],
+      "Associate to OS's, Locations & Organizations. Options are: always, new or never.": [
+        ""
+      ],
+      "Update templates that are locked": [
+        ""
+      ],
+      "Lock imported templates": [
+        ""
+      ],
+      "Show template diff in response": [
+        ""
+      ],
+      "Initiate Export": [
+        ""
+      ],
+      "Specify how to handle metadata": [
+        ""
+      ],
+      "Custom commit message for templates export": [
+        ""
+      ],
+      "Using file-based synchronization, but couldn't access %s. ": [
+        ""
+      ],
+      "Please check the access permissions/SELinux and make sure it is readable/writable for the web application user account, typically '%s'.": [
+        ""
+      ],
+      "Always": [
+        ""
+      ],
+      "New": [
+        "Ny"
+      ],
+      "Never": [
+        ""
+      ],
+      "Lock": [
+        ""
+      ],
+      "Keep, lock new": [
+        ""
+      ],
+      "Keep, do not lock new": [
+        ""
+      ],
+      "Unlock": [
+        ""
+      ],
+      "Refresh": [
+        ""
+      ],
+      "Keep": [
+        ""
+      ],
+      "Remove": [
+        ""
+      ],
+      "Template Sync": [
+        ""
+      ],
+      "Choose verbosity for Rake task importing templates": [
+        ""
+      ],
+      "Verbosity": [
+        ""
+      ],
+      "Associate templates to OS, organization and location": [
+        ""
+      ],
+      "Associate": [
+        ""
+      ],
+      "The string that will be added as prefix to imported templates": [
+        ""
+      ],
+      "Prefix": [
+        ""
+      ],
+      "The directory within the Git repo containing the templates": [
+        ""
+      ],
+      "Dirname": [
+        ""
+      ],
+      "Import/export names matching this regex (case-insensitive; snippets are not filtered)": [
+        ""
+      ],
+      "Filter": [
+        "Filter"
+      ],
+      "Target path to import/export. Different protocols can be used, for example /tmp/dir, git://example.com, https://example.com, ssh://example.com. When exporting to /tmp, note that production deployments may be configured to use private tmp.": [
+        ""
+      ],
+      "Repo": [
+        ""
+      ],
+      "Negate the filter for import/export": [
+        ""
+      ],
+      "Negate": [
+        ""
+      ],
+      "Default branch in Git repo": [
+        ""
+      ],
+      "Branch": [
+        ""
+      ],
+      "Default metadata export mode, refresh re-renders metadata, keep will keep existing metadata, remove exports template without metadata": [
+        ""
+      ],
+      "Metadata export mode": [
+        ""
+      ],
+      "Should importing overwrite locked templates?": [
+        ""
+      ],
+      "Force import": [
+        ""
+      ],
+      "How to handle lock for imported templates?": [
+        ""
+      ],
+      "Lock templates": [
+        ""
+      ],
+      "Commit message": [
+        ""
+      ],
+      "Sync Templates": [
+        ""
+      ],
+      "Import or Export Templates": [
+        ""
+      ],
+      "Use default value from settings": [
+        ""
+      ],
+      "Page Not Found": [
+        ""
+      ],
+      "The page you are looking for does not exist": [
+        ""
+      ],
+      "You are not authorized to perform this action.": [
+        ""
+      ],
+      "Please request one of the required permissions listed below from a Foreman administrator:": [
+        ""
+      ],
+      "Permission Denied": [
+        ""
+      ],
+      "Back to sync form": [
+        ""
+      ],
+      "Remote action:": [
+        ""
+      ],
+      "Import facts": [
+        ""
+      ],
+      "Action with sub plans": [
+        ""
+      ],
+      "Import Puppet classes": [
+        ""
+      ]
+    }
+  }
+};

data/app/assets/javascripts/foreman_templates/locale/zh_CN/foreman_templates.js

@@ -0,0 +1,211 @@
+ locales['foreman_templates'] = locales['foreman_templates'] || {}; locales['foreman_templates']['zh_CN'] = {
+  "domain": "foreman_templates",
+  "locale_data": {
+    "foreman_templates": {
+      "": {
+        "Project-Id-Version": "foreman_templates 9.3.0",
+        "Report-Msgid-Bugs-To": "",
+        "PO-Revision-Date": "2019-10-14 12:27+0000",
+        "Last-Translator": "Amit Upadhye <aupadhye@redhat.com>, 2022",
+        "Language-Team": "Chinese (China) (https://www.transifex.com/foreman/teams/114/zh_CN/)",
+        "MIME-Version": "1.0",
+        "Content-Type": "text/plain; charset=UTF-8",
+        "Content-Transfer-Encoding": "8bit",
+        "Language": "zh_CN",
+        "Plural-Forms": "nplurals=1; plural=0;",
+        "lang": "zh_CN",
+        "domain": "foreman_templates",
+        "plural_forms": "nplurals=1; plural=0;"
+      },
+      "Branch in Git repo.": [
+        "Git 仓库中的分支。"
+      ],
+      "Override the default repo from settings.": [
+        "覆盖设置中的默认仓库。"
+      ],
+      "Export templates with names matching this regex (case-insensitive; snippets are not filtered).": [
+        "导出名称与此正则表达式匹配的模板（不区分大小写；不过滤代码段）。"
+      ],
+      "Negate the prefix (for purging).": [
+        "否定前缀（用于清除）。"
+      ],
+      "The directory within Git repo containing the templates": [
+        "Git 仓库中包含模板的目录"
+      ],
+      "Initiate Import": [
+        "启动导入"
+      ],
+      "The string all imported templates should begin with.": [
+        "所有导入的模板应以字符串开头。"
+      ],
+      "Associate to OS's, Locations & Organizations. Options are: always, new or never.": [
+        "与操作系统，位置和机构相关。选项为：总是，新的或永不。"
+      ],
+      "Update templates that are locked": [
+        "更新锁定的模板"
+      ],
+      "Lock imported templates": [
+        "锁定导入的模板"
+      ],
+      "Show template diff in response": [
+        "显示模板差异作为响应"
+      ],
+      "Initiate Export": [
+        "启动导出"
+      ],
+      "Specify how to handle metadata": [
+        "指定如何处理元数据"
+      ],
+      "Custom commit message for templates export": [
+        "模板导出的自定义提交消息"
+      ],
+      "Using file-based synchronization, but couldn't access %s. ": [
+        "使用基于文件的同步，但无法访问 %s。 "
+      ],
+      "Please check the access permissions/SELinux and make sure it is readable/writable for the web application user account, typically '%s'.": [
+        "请检查访问权限/ SELinux，确保 Web 应用程序用户帐户（通常为 '%s'）可读写。"
+      ],
+      "Always": [
+        "总是"
+      ],
+      "New": [
+        "新"
+      ],
+      "Never": [
+        "决不"
+      ],
+      "Lock": [
+        "锁定"
+      ],
+      "Keep, lock new": [
+        "keep, 锁定新的"
+      ],
+      "Keep, do not lock new": [
+        "keep，不锁定新的"
+      ],
+      "Unlock": [
+        "开锁"
+      ],
+      "Refresh": [
+        "刷新"
+      ],
+      "Keep": [
+        "保持"
+      ],
+      "Remove": [
+        "移除"
+      ],
+      "Template Sync": [
+        "模板同步"
+      ],
+      "Choose verbosity for Rake task importing templates": [
+        "为 Rake 任务导入模板选择详细程度"
+      ],
+      "Verbosity": [
+        "详细度"
+      ],
+      "Associate templates to OS, organization and location": [
+        "将模板与操作系统，机构和位置相关联"
+      ],
+      "Associate": [
+        "关联"
+      ],
+      "The string that will be added as prefix to imported templates": [
+        "将作为前缀添加到导入模板的字符串"
+      ],
+      "Prefix": [
+        "前缀"
+      ],
+      "The directory within the Git repo containing the templates": [
+        "Git 仓库中包含模板的目录"
+      ],
+      "Dirname": [
+        "Dirname"
+      ],
+      "Import/export names matching this regex (case-insensitive; snippets are not filtered)": [
+        "导入/导出与该正则表达式匹配的名称（不区分大小写；不过滤代码段）"
+      ],
+      "Filter": [
+        "过滤器"
+      ],
+      "Target path to import/export. Different protocols can be used, for example /tmp/dir, git://example.com, https://example.com, ssh://example.com. When exporting to /tmp, note that production deployments may be configured to use private tmp.": [
+        "要导入/导出的目标路径。可以使用不同的协议，如 /tmp/dir、git://example.com、https://example.com、ssh://example.com. 当导出至 /tmp 时，请注意，生产部署可能被配置为使用私有 tmp。"
+      ],
+      "Repo": [
+        "仓库"
+      ],
+      "Negate the filter for import/export": [
+        "导入/导出的负过滤器"
+      ],
+      "Negate": [
+        "否定"
+      ],
+      "Default branch in Git repo": [
+        "Git 仓库中的默认分支"
+      ],
+      "Branch": [
+        "分支"
+      ],
+      "Default metadata export mode, refresh re-renders metadata, keep will keep existing metadata, remove exports template without metadata": [
+        "默认元数据导出模式，刷新后重新渲染元数据，保留将保留现有元数据，删除不包含元数据的导出模板"
+      ],
+      "Metadata export mode": [
+        "元数据导出模式"
+      ],
+      "Should importing overwrite locked templates?": [
+        "是否应该导入覆盖锁定的模板？"
+      ],
+      "Force import": [
+        "强制导入"
+      ],
+      "How to handle lock for imported templates?": [
+        "如何处理导入的模板锁定？"
+      ],
+      "Lock templates": [
+        "锁定模板"
+      ],
+      "Commit message": [
+        "提交消息"
+      ],
+      "Sync Templates": [
+        "同步模板"
+      ],
+      "Import or Export Templates": [
+        "导入或导出模板"
+      ],
+      "Use default value from settings": [
+        "使用设置中的默认值"
+      ],
+      "Page Not Found": [
+        "页没有找到"
+      ],
+      "The page you are looking for does not exist": [
+        "您查找的页面不存在"
+      ],
+      "You are not authorized to perform this action.": [
+        "您没有执行这个操作的授权。"
+      ],
+      "Please request one of the required permissions listed below from a Foreman administrator:": [
+        "请向 Foreman 管理员请求下列所需权限之一："
+      ],
+      "Permission Denied": [
+        "没有足够权限"
+      ],
+      "Back to sync form": [
+        "返回到同步表单"
+      ],
+      "Remote action:": [
+        "远程操作："
+      ],
+      "Import facts": [
+        "导入事实"
+      ],
+      "Action with sub plans": [
+        "有子计划的操作"
+      ],
+      "Import Puppet classes": [
+        "导入 Puppet 类"
+      ]
+    }
+  }
+};

data/app/assets/javascripts/foreman_templates/locale/zh_TW/foreman_templates.js

@@ -0,0 +1,211 @@
+ locales['foreman_templates'] = locales['foreman_templates'] || {}; locales['foreman_templates']['zh_TW'] = {
+  "domain": "foreman_templates",
+  "locale_data": {
+    "foreman_templates": {
+      "": {
+        "Project-Id-Version": "foreman_templates 9.3.0",
+        "Report-Msgid-Bugs-To": "",
+        "PO-Revision-Date": "2019-10-14 12:27+0000",
+        "Last-Translator": "Bryan Kearney <bryan.kearney@gmail.com>, 2022",
+        "Language-Team": "Chinese (Taiwan) (https://www.transifex.com/foreman/teams/114/zh_TW/)",
+        "MIME-Version": "1.0",
+        "Content-Type": "text/plain; charset=UTF-8",
+        "Content-Transfer-Encoding": "8bit",
+        "Language": "zh_TW",
+        "Plural-Forms": "nplurals=1; plural=0;",
+        "lang": "zh_TW",
+        "domain": "foreman_templates",
+        "plural_forms": "nplurals=1; plural=0;"
+      },
+      "Branch in Git repo.": [
+        ""
+      ],
+      "Override the default repo from settings.": [
+        ""
+      ],
+      "Export templates with names matching this regex (case-insensitive; snippets are not filtered).": [
+        ""
+      ],
+      "Negate the prefix (for purging).": [
+        ""
+      ],
+      "The directory within Git repo containing the templates": [
+        ""
+      ],
+      "Initiate Import": [
+        ""
+      ],
+      "The string all imported templates should begin with.": [
+        ""
+      ],
+      "Associate to OS's, Locations & Organizations. Options are: always, new or never.": [
+        ""
+      ],
+      "Update templates that are locked": [
+        ""
+      ],
+      "Lock imported templates": [
+        ""
+      ],
+      "Show template diff in response": [
+        ""
+      ],
+      "Initiate Export": [
+        ""
+      ],
+      "Specify how to handle metadata": [
+        ""
+      ],
+      "Custom commit message for templates export": [
+        ""
+      ],
+      "Using file-based synchronization, but couldn't access %s. ": [
+        ""
+      ],
+      "Please check the access permissions/SELinux and make sure it is readable/writable for the web application user account, typically '%s'.": [
+        ""
+      ],
+      "Always": [
+        ""
+      ],
+      "New": [
+        "新增"
+      ],
+      "Never": [
+        "永不"
+      ],
+      "Lock": [
+        "鎖定"
+      ],
+      "Keep, lock new": [
+        ""
+      ],
+      "Keep, do not lock new": [
+        ""
+      ],
+      "Unlock": [
+        "解鎖"
+      ],
+      "Refresh": [
+        "重新整理"
+      ],
+      "Keep": [
+        ""
+      ],
+      "Remove": [
+        "移除"
+      ],
+      "Template Sync": [
+        ""
+      ],
+      "Choose verbosity for Rake task importing templates": [
+        ""
+      ],
+      "Verbosity": [
+        ""
+      ],
+      "Associate templates to OS, organization and location": [
+        ""
+      ],
+      "Associate": [
+        ""
+      ],
+      "The string that will be added as prefix to imported templates": [
+        ""
+      ],
+      "Prefix": [
+        ""
+      ],
+      "The directory within the Git repo containing the templates": [
+        ""
+      ],
+      "Dirname": [
+        ""
+      ],
+      "Import/export names matching this regex (case-insensitive; snippets are not filtered)": [
+        ""
+      ],
+      "Filter": [
+        "篩選器"
+      ],
+      "Target path to import/export. Different protocols can be used, for example /tmp/dir, git://example.com, https://example.com, ssh://example.com. When exporting to /tmp, note that production deployments may be configured to use private tmp.": [
+        ""
+      ],
+      "Repo": [
+        "軟體庫"
+      ],
+      "Negate the filter for import/export": [
+        ""
+      ],
+      "Negate": [
+        ""
+      ],
+      "Default branch in Git repo": [
+        ""
+      ],
+      "Branch": [
+        ""
+      ],
+      "Default metadata export mode, refresh re-renders metadata, keep will keep existing metadata, remove exports template without metadata": [
+        ""
+      ],
+      "Metadata export mode": [
+        ""
+      ],
+      "Should importing overwrite locked templates?": [
+        ""
+      ],
+      "Force import": [
+        ""
+      ],
+      "How to handle lock for imported templates?": [
+        ""
+      ],
+      "Lock templates": [
+        ""
+      ],
+      "Commit message": [
+        ""
+      ],
+      "Sync Templates": [
+        ""
+      ],
+      "Import or Export Templates": [
+        ""
+      ],
+      "Use default value from settings": [
+        ""
+      ],
+      "Page Not Found": [
+        ""
+      ],
+      "The page you are looking for does not exist": [
+        ""
+      ],
+      "You are not authorized to perform this action.": [
+        "您未經許可執行這項動作。"
+      ],
+      "Please request one of the required permissions listed below from a Foreman administrator:": [
+        "請從 Foreman 管理者處，要求下列所需權限之一："
+      ],
+      "Permission Denied": [
+        ""
+      ],
+      "Back to sync form": [
+        ""
+      ],
+      "Remote action:": [
+        "遠端動作："
+      ],
+      "Import facts": [
+        "匯入詳情"
+      ],
+      "Action with sub plans": [
+        "有子計畫的動作"
+      ],
+      "Import Puppet classes": [
+        "匯入 Puppet 類別"
+      ]
+    }
+  }
+};

data/app/services/foreman_templates/template_exporter.rb

@@ -7,6 +7,9 @@ module ForemanTemplates
     def initialize(args = {})
       super args
       @result_lines = []
+      @uri = URI(@repo)
+      @redacted_uri = @uri.dup
+      @redacted_uri.password = '*****' if @uri.password
     end
 
     def export!
@@ -48,7 +51,11 @@ module ForemanTemplates
         @warning = 'No change detected, skipping the commit and push'
       end
     rescue StandardError => e
-      @error = e.message
+      @error = if @uri.password
+                 e.message.gsub(@uri.to_s, @redacted_uri.to_s)
+               else
+                 e.message
+               end
     ensure
       FileUtils.remove_entry_secure(@dir) if File.exist?(@dir)
     end
@@ -132,7 +139,7 @@ module ForemanTemplates
 
     def export_result
       {
-        :templates => @result_lines, :repo => @repo, :branch => @branch,
+        :templates => @result_lines, :repo => @redacted_uri, :branch => @branch,
         :git_user => foreman_git_user, :error => @error, :warning => @warning
       }
     end

data/db/migrate/20211122154929_templates_settings_category_to_dsl.rb

@@ -1,5 +1,5 @@
 class TemplatesSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
   def up
-    Setting.where(category: 'Setting::TemplateSync').update_all(category: 'Setting')
+    Setting.where(category: 'Setting::TemplateSync').update_all(category: 'Setting') if column_exists?(:settings, :category)
   end
 end

data/lib/foreman_templates/engine.rb

@@ -24,7 +24,8 @@ module ForemanTemplates
 
     initializer 'foreman_templates.register_plugin', :before => :finisher_hook do
       Foreman::Plugin.register :foreman_templates do
-        requires_foreman '>= 3.3'
+        requires_foreman '>= 3.7'
+        register_gettext
 
         apipie_documented_controllers ["#{ForemanTemplates::Engine.root}/app/controllers/api/v2/*.rb"]
 

data/lib/foreman_templates/version.rb

@@ -1,3 +1,3 @@
 module ForemanTemplates
-  VERSION = '9.3.0'.freeze
+  VERSION = "9.4.0".freeze
 end