foreman_discovery 26.1.2 → 26.2.0

data/app/assets/javascripts/foreman_discovery/locale/en_GB/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 26.0.2",
+        "Project-Id-Version": "foreman_discovery 26.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Andi Chandler <andi@gowling.com>, 2015-2019,2023",

data/app/assets/javascripts/foreman_discovery/locale/es/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 26.0.2",
+        "Project-Id-Version": "foreman_discovery 26.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Sergio Ocón-Cárdenas, 2014",

data/app/assets/javascripts/foreman_discovery/locale/fr/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 26.0.2",
+        "Project-Id-Version": "foreman_discovery 26.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Baptiste Agasse <baptiste.agasse@gmail.com>, 2018-2019",
@@ -654,7 +654,7 @@
         "Sélectionner tous les éléments de cette page"
       ],
       "Select location": [
-        "Sélectionner une localisation"
+        "Sélectionner un emplacement"
       ],
       "Select organization": [
         "Choisir une organisation"
@@ -789,7 +789,7 @@
         "doit commencer par une lettre ou par ERB."
       ],
       "must start with a letter. Allowed characters: `a-z`, `A-Z`, `0-9` and `-`. Max length is 62 characters.": [
-        ""
+        "doit commencer par une lettre. Caractères utilisés: `a-z`, `A-Z`, `0-9` and `-`. La longueur maximale est de 62 caractères."
       ],
       "not required if it's a virtual machine": [
         "non requis s'il s'agit d'une machine virtuelle"

data/app/assets/javascripts/foreman_discovery/locale/gl/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 26.0.2",
+        "Project-Id-Version": "foreman_discovery 26.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",

data/app/assets/javascripts/foreman_discovery/locale/it/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 26.0.2",
+        "Project-Id-Version": "foreman_discovery 26.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "caifti <caifti@gmail.com>, 2014",

data/app/assets/javascripts/foreman_discovery/locale/ja/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 26.0.2",
+        "Project-Id-Version": "foreman_discovery 26.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "山田 修司 🍣 Shuji Yamada <uzy.exe@gmail.com>, 2015",
@@ -537,7 +537,7 @@
         "エラーが原因で 1 つ以上のホストの検出に失敗しました: %s"
       ],
       "Option 'url' must be provided": [
-        "オプション 'url' を指定する必要があります。"
+        "オプション 'url' を指定する必要があります"
       ],
       "Option 'url' must be valid URI: %s": [
         "オプション 'url' は有効な URI でなければなりません: %s"
@@ -783,7 +783,7 @@
         "文字または ERB で開始する必要があります。"
       ],
       "must start with a letter. Allowed characters: `a-z`, `A-Z`, `0-9` and `-`. Max length is 62 characters.": [
-        ""
+        "文字で開始する必要があります。許可される文字: `a-z`、`A-Z`、`0-9`、および `-`。最大長は 62 文字です。"
       ],
       "not required if it's a virtual machine": [
         "仮想マシンの場合は不要です"
@@ -819,7 +819,7 @@
         "ホストが管理されており、値がホストグループから継承されていない場合に必須です"
       ],
       "required if host is managed, does not have IPv4 IP / Subnet, or the value is not inherited from the host group": [
-        "ホストが管理対象の場合、IPv4 IP/サブネットがない場合、または値がホストグループから継承されていない場合は必須です。"
+        "ホストが管理対象の場合、IPv4 IP/サブネットがない場合、または値がホストグループから継承されていない場合は必須です"
       ],
       "required if not imaged based provisioning and host is managed and value is not inherited from host group": [
         "イメージベースのプロビジョニングでない場合で、ホストが管理されており、値がホストグループから継承されていない場合に必須です"

data/app/assets/javascripts/foreman_discovery/locale/ka/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 26.0.2",
+        "Project-Id-Version": "foreman_discovery 26.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",

data/app/assets/javascripts/foreman_discovery/locale/ko/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 26.0.2",
+        "Project-Id-Version": "foreman_discovery 26.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2022",
@@ -783,7 +783,7 @@
         "문자 또는 ERB로 시작해야 합니다."
       ],
       "must start with a letter. Allowed characters: `a-z`, `A-Z`, `0-9` and `-`. Max length is 62 characters.": [
-        ""
+        "반드시 영문자로 시작해야 합니다. 허용되는 문자는 `az`, `AZ`, `0-9`, `-`입니다. 최대 길이는 62자입니다."
       ],
       "not required if it's a virtual machine": [
         "가상 머신의 경우 필요하지 않습니다"

data/app/assets/javascripts/foreman_discovery/locale/pt_BR/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 26.0.2",
+        "Project-Id-Version": "foreman_discovery 26.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Valeria S Silva <valeriassilva@live.com>, 2015",

data/app/assets/javascripts/foreman_discovery/locale/ru/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 26.0.2",
+        "Project-Id-Version": "foreman_discovery 26.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Yulia <yulia.poyarkova@redhat.com>, 2016",

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 26.0.2",
+        "Project-Id-Version": "foreman_discovery 26.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "johnny.westerlund <johnny.westerlund@gmail.com>, 2014",

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 26.0.2",
+        "Project-Id-Version": "foreman_discovery 26.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2024",
@@ -783,7 +783,7 @@
         "必须以字母或 ERB 开始。"
       ],
       "must start with a letter. Allowed characters: `a-z`, `A-Z`, `0-9` and `-`. Max length is 62 characters.": [
-        ""
+        "必须以一个字母开始。允许的字符：'a-z'、'A-Z'、'0-9' 和 '-'。最大长度为 62 个字符。"
       ],
       "not required if it's a virtual machine": [
         "如果是虚拟机，则不需要"

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 26.0.2",
+        "Project-Id-Version": "foreman_discovery 26.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",

data/app/controllers/foreman_discovery/concerns/hosts_controller_extensions.rb

@@ -19,6 +19,16 @@ module ForemanDiscovery
 
         @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, false, host_params) if @host.is_a?(Host::Discovered)
       end
+
+      def find_resource
+        if (id = params[:id]).blank?
+          not_found
+          return false
+        end
+        @host = Host::Discovered.authorized(:edit_discovered_hosts, Host::Discovered).find_by(id: id)
+        @host ||= super
+        @host
+      end
     end
   end
 end

data/app/services/foreman_discovery/host_converter.rb

@@ -55,7 +55,7 @@ class ForemanDiscovery::HostConverter
   end
 
   def self.ip_for_subnet(subnet, mac, ip)
-    return ip if ip && subnet&.unused_ip(mac)&.ip_include?(ip)
+    return ip if ip.present? && subnet&.unused_ip(mac)&.ip_include?(ip)
 
     unused_ip_for_subnet(subnet, mac, ip)
   end

data/db/seeds.d/60_discovery_proxy_feature.rb

@@ -1,2 +1,2 @@
 f = Feature.unscoped.where(:name => 'Discovery').first_or_create
-raise "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?
+raise "Unable to create proxy feature: #{SeedHelper.format_errors(f)}" if f.nil? || f.errors.any?

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "26.1.2"
+  VERSION = "26.2.0"
 end

data/locale/ca/foreman_discovery.po

@@ -7,7 +7,7 @@
 # Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 26.0.2\n"
+"Project-Id-Version: foreman_discovery 26.1.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2013-11-15 17:25+0000\n"
 "Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2017\n"

data/locale/cs_CZ/foreman_discovery.po

@@ -6,7 +6,7 @@
 # Pavel Borecki <pavel.borecki@gmail.com>, 2018-2020
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 26.0.2\n"
+"Project-Id-Version: foreman_discovery 26.1.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2013-11-15 17:25+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018-2020\n"

data/locale/de/foreman_discovery.po

@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the foreman_discovery package.
 #
 # Translators:
-# Crited <Alexander.Stoll@netways.de>, 2019
+# Alexander Stoll <Alexander.Stoll@netways.de>, 2019
 # Arnold Bechtoldt <mail@arnoldbechtoldt.com>, 2014
 # Christina Gurski <Gurski_christina@yahoo.de>, 2015
 # Ettore Atalan <atalanttore@googlemail.com>, 2014-2017
@@ -15,7 +15,7 @@
 # stbenjam <stephen@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 26.0.2\n"
+"Project-Id-Version: foreman_discovery 26.1.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2013-11-15 17:25+0000\n"
 "Last-Translator: pdolinic, 2021\n"