diff --git a/doc/TODO.md b/doc/TODO.md index e198fa66b..b3945a440 100644 --- a/doc/TODO.md +++ b/doc/TODO.md @@ -2,7 +2,7 @@ * Controls for all resources: stop all, start all, ... ? -* Display allocation scores and blocked status +* Display allocation kinds and blocked status * Show if a resource has failcounts diff --git a/hawk/app/assets/javascripts/gettext/locale/ar/app.js b/hawk/app/assets/javascripts/gettext/locale/ar/app.js index b094bfce3..1d7025510 100644 --- a/hawk/app/assets/javascripts/gettext/locale/ar/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/ar/app.js @@ -659,11 +659,11 @@ var locales = locales || {}; locales['ar'] = { null, "كلمة السر غير صالحة" ], - "Invalid score": [ + "Invalid kind": [ null, "نتيجة غير صحيحة" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "نتيجة غير صحيحة \\\"%{score}\\\"" ], @@ -1091,7 +1091,7 @@ var locales = locales || {}; locales['ar'] = { null, "" ], - "Score": [ + "Kind": [ null, "النتيجة" ], diff --git a/hawk/app/assets/javascripts/gettext/locale/cs/app.js b/hawk/app/assets/javascripts/gettext/locale/cs/app.js index f8a6bc326..da3149376 100644 --- a/hawk/app/assets/javascripts/gettext/locale/cs/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/cs/app.js @@ -661,11 +661,11 @@ var locales = locales || {}; locales['cs'] = { null, "Neplatné heslo" ], - "Invalid score": [ + "Invalid kind": [ null, "Neplatné skóre" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "Neplatné skóre „%{score}“" ], @@ -1093,7 +1093,7 @@ var locales = locales || {}; locales['cs'] = { null, "" ], - "Score": [ + "Kind": [ null, "Skóre" ], diff --git a/hawk/app/assets/javascripts/gettext/locale/de/app.js b/hawk/app/assets/javascripts/gettext/locale/de/app.js index dedd7f408..aca309263 100644 --- a/hawk/app/assets/javascripts/gettext/locale/de/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/de/app.js @@ -659,11 +659,11 @@ var locales = locales || {}; locales['de'] = { null, "Ungültiges Passwort" ], - "Invalid score": [ + "Invalid kind": [ null, "Ungültige Note" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "Ungültige Note \\\"%{score}\\\"" ], @@ -1091,7 +1091,7 @@ var locales = locales || {}; locales['de'] = { null, "" ], - "Score": [ + "Kind": [ null, "Note" ], diff --git a/hawk/app/assets/javascripts/gettext/locale/es/app.js b/hawk/app/assets/javascripts/gettext/locale/es/app.js index 4bd628b96..21c9695b1 100644 --- a/hawk/app/assets/javascripts/gettext/locale/es/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/es/app.js @@ -659,11 +659,11 @@ var locales = locales || {}; locales['es'] = { null, "Contraseña no válida" ], - "Invalid score": [ + "Invalid kind": [ null, "Puntuación no válida" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "Puntuación no válida %{score}" ], @@ -1091,7 +1091,7 @@ var locales = locales || {}; locales['es'] = { null, "" ], - "Score": [ + "Kind": [ null, "Puntuación" ], diff --git a/hawk/app/assets/javascripts/gettext/locale/fr/app.js b/hawk/app/assets/javascripts/gettext/locale/fr/app.js index bafbc16b4..57c6b39e1 100644 --- a/hawk/app/assets/javascripts/gettext/locale/fr/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/fr/app.js @@ -659,11 +659,11 @@ var locales = locales || {}; locales['fr'] = { null, "Mot de passe non valide" ], - "Invalid score": [ + "Invalid kind": [ null, "Score non valide" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "Score \\\"%{score}\\\" non valide" ], @@ -1091,9 +1091,9 @@ var locales = locales || {}; locales['fr'] = { null, "" ], - "Score": [ + "Kind": [ null, - "Score" + "Kind" ], "Show Rule Editor": [ null, diff --git a/hawk/app/assets/javascripts/gettext/locale/hu/app.js b/hawk/app/assets/javascripts/gettext/locale/hu/app.js index 60eaa79b0..c71060e86 100644 --- a/hawk/app/assets/javascripts/gettext/locale/hu/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/hu/app.js @@ -659,11 +659,11 @@ var locales = locales || {}; locales['hu'] = { null, "Érvénytelen jelszó" ], - "Invalid score": [ + "Invalid kind": [ null, "Érvénytelen pontszám" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "Érvénytelen pontszám \\\"%{score}\\\"" ], @@ -1091,7 +1091,7 @@ var locales = locales || {}; locales['hu'] = { null, "" ], - "Score": [ + "Kind": [ null, "Pontszám" ], diff --git a/hawk/app/assets/javascripts/gettext/locale/it/app.js b/hawk/app/assets/javascripts/gettext/locale/it/app.js index 845fb647d..27429c327 100644 --- a/hawk/app/assets/javascripts/gettext/locale/it/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/it/app.js @@ -659,11 +659,11 @@ var locales = locales || {}; locales['it'] = { null, "Password non valida" ], - "Invalid score": [ + "Invalid kind": [ null, "Punteggio non valido" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "Punteggio non valido \\\"%{score}\\\"" ], @@ -1091,7 +1091,7 @@ var locales = locales || {}; locales['it'] = { null, "" ], - "Score": [ + "Kind": [ null, "Punteggio" ], diff --git a/hawk/app/assets/javascripts/gettext/locale/ja/app.js b/hawk/app/assets/javascripts/gettext/locale/ja/app.js index 8f03ac6be..b338b37c6 100644 --- a/hawk/app/assets/javascripts/gettext/locale/ja/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/ja/app.js @@ -657,11 +657,11 @@ var locales = locales || {}; locales['ja'] = { null, "無効なパスワード" ], - "Invalid score": [ + "Invalid kind": [ null, "無効なスコア" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "無効なスコア「%{score}」" ], @@ -1089,7 +1089,7 @@ var locales = locales || {}; locales['ja'] = { null, "" ], - "Score": [ + "Kind": [ null, "スコア" ], diff --git a/hawk/app/assets/javascripts/gettext/locale/ko/app.js b/hawk/app/assets/javascripts/gettext/locale/ko/app.js index 500ba5e91..124453073 100644 --- a/hawk/app/assets/javascripts/gettext/locale/ko/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/ko/app.js @@ -657,11 +657,11 @@ var locales = locales || {}; locales['ko'] = { null, "잘못된 비밀번호" ], - "Invalid score": [ + "Invalid kind": [ null, "잘못된 점수" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "점수 \\\"%{score}\\\"이(가) 잘못되었습니다." ], @@ -1089,7 +1089,7 @@ var locales = locales || {}; locales['ko'] = { null, "" ], - "Score": [ + "Kind": [ null, "점수" ], diff --git a/hawk/app/assets/javascripts/gettext/locale/nl/app.js b/hawk/app/assets/javascripts/gettext/locale/nl/app.js index 316a97453..c1fd9f783 100644 --- a/hawk/app/assets/javascripts/gettext/locale/nl/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/nl/app.js @@ -659,11 +659,11 @@ var locales = locales || {}; locales['nl'] = { null, "Ongeldig wachtwoord" ], - "Invalid score": [ + "Invalid kind": [ null, "Ongeldige score" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "Ongeldige score \\\"%{score}\\\"" ], @@ -1091,9 +1091,9 @@ var locales = locales || {}; locales['nl'] = { null, "" ], - "Score": [ + "Kind": [ null, - "Score" + "Kind" ], "Show Rule Editor": [ null, diff --git a/hawk/app/assets/javascripts/gettext/locale/pl/app.js b/hawk/app/assets/javascripts/gettext/locale/pl/app.js index 739512b1a..f2328609b 100644 --- a/hawk/app/assets/javascripts/gettext/locale/pl/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/pl/app.js @@ -661,11 +661,11 @@ var locales = locales || {}; locales['pl'] = { null, "Nieprawidłowe hasło" ], - "Invalid score": [ + "Invalid kind": [ null, "Nieprawidłowa wartość punktowa" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "Nieprawidłowa wartości punktowa \\\"%{score}\\\"" ], @@ -1093,7 +1093,7 @@ var locales = locales || {}; locales['pl'] = { null, "" ], - "Score": [ + "Kind": [ null, "Punkty" ], diff --git a/hawk/app/assets/javascripts/gettext/locale/pt_BR/app.js b/hawk/app/assets/javascripts/gettext/locale/pt_BR/app.js index d92863a56..60165bb34 100644 --- a/hawk/app/assets/javascripts/gettext/locale/pt_BR/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/pt_BR/app.js @@ -659,11 +659,11 @@ var locales = locales || {}; locales['pt-BR'] = { null, "Senha inválida" ], - "Invalid score": [ + "Invalid kind": [ null, "Pontuação inválida" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "Pontuação \\\"%{score}\\\" inválida" ], @@ -1091,7 +1091,7 @@ var locales = locales || {}; locales['pt-BR'] = { null, "" ], - "Score": [ + "Kind": [ null, "Pontuação" ], diff --git a/hawk/app/assets/javascripts/gettext/locale/ru/app.js b/hawk/app/assets/javascripts/gettext/locale/ru/app.js index 6ef517cdc..45eff99f2 100644 --- a/hawk/app/assets/javascripts/gettext/locale/ru/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/ru/app.js @@ -661,11 +661,11 @@ var locales = locales || {}; locales['ru'] = { null, "Неверный пароль" ], - "Invalid score": [ + "Invalid kind": [ null, "Недопустимая оценка" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "Недопустимая оценка: \\\"%{score}\\\"" ], @@ -1093,7 +1093,7 @@ var locales = locales || {}; locales['ru'] = { null, "" ], - "Score": [ + "Kind": [ null, "Оценка" ], diff --git a/hawk/app/assets/javascripts/gettext/locale/sv/app.js b/hawk/app/assets/javascripts/gettext/locale/sv/app.js index 653fdc625..fdacddd9a 100644 --- a/hawk/app/assets/javascripts/gettext/locale/sv/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/sv/app.js @@ -659,11 +659,11 @@ var locales = locales || {}; locales['sv'] = { null, "Ogiltigt lösenord" ], - "Invalid score": [ + "Invalid kind": [ null, "Ogiltig poäng" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "Ogiltig poäng \\\"%{score}\\\"" ], @@ -1091,7 +1091,7 @@ var locales = locales || {}; locales['sv'] = { null, "" ], - "Score": [ + "Kind": [ null, "Poäng" ], diff --git a/hawk/app/assets/javascripts/gettext/locale/zh_CN/app.js b/hawk/app/assets/javascripts/gettext/locale/zh_CN/app.js index c6c6f0c63..fb9e5ded2 100644 --- a/hawk/app/assets/javascripts/gettext/locale/zh_CN/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/zh_CN/app.js @@ -657,11 +657,11 @@ var locales = locales || {}; locales['zh-CN'] = { null, "密码无效" ], - "Invalid score": [ + "Invalid kind": [ null, "分数无效" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "分数“%{score}”无效" ], @@ -1089,7 +1089,7 @@ var locales = locales || {}; locales['zh-CN'] = { null, "" ], - "Score": [ + "Kind": [ null, "分数" ], diff --git a/hawk/app/assets/javascripts/gettext/locale/zh_TW/app.js b/hawk/app/assets/javascripts/gettext/locale/zh_TW/app.js index 1f13701f4..e0f090cb8 100644 --- a/hawk/app/assets/javascripts/gettext/locale/zh_TW/app.js +++ b/hawk/app/assets/javascripts/gettext/locale/zh_TW/app.js @@ -657,11 +657,11 @@ var locales = locales || {}; locales['zh-TW'] = { null, "密碼無效" ], - "Invalid score": [ + "Invalid kind": [ null, "無效的分數" ], - "Invalid score \\\"%{score}\\\"": [ + "Invalid kind \\\"%{score}\\\"": [ null, "分數「%{score}」無效" ], @@ -1089,7 +1089,7 @@ var locales = locales || {}; locales['zh-TW'] = { null, "" ], - "Score": [ + "Kind": [ null, "分數" ], diff --git a/hawk/app/assets/javascripts/module/location.js b/hawk/app/assets/javascripts/module/location.js index 53272e31f..8d9545c07 100644 --- a/hawk/app/assets/javascripts/module/location.js +++ b/hawk/app/assets/javascripts/module/location.js @@ -30,7 +30,7 @@ '
', '', '
', '', diff --git a/hawk/app/models/colocation.rb b/hawk/app/models/colocation.rb index a8c5ef7eb..066c78972 100644 --- a/hawk/app/models/colocation.rb +++ b/hawk/app/models/colocation.rb @@ -149,8 +149,8 @@ def help_text super.merge( "score" => { type: "string", - shortdesc: _("Score"), - longdesc: _('The score determines the location relationship between the resources.'), + shortdesc: _("Kind"), + longdesc: _('The kind determines the location relationship between the resources.'), default: "" }, "node-attribute" => { diff --git a/hawk/app/models/location.rb b/hawk/app/models/location.rb index 45916c969..3c9a6f592 100644 --- a/hawk/app/models/location.rb +++ b/hawk/app/models/location.rb @@ -30,7 +30,7 @@ class Location < Constraint unless score_types.include? rule[:score].downcase if record.simple? unless rule[:score].match(/^-?[0-9]+$/) - errors.add :base, _('Invalid score "%{score}"') % { :score => rule[:score] } + errors.add :base, _('Invalid kind "%{score}"') % { :score => rule[:score] } end else # We're allowing any old junk for scores for complex resources, @@ -226,7 +226,7 @@ def help_text }, "score" => { type: "string", - shortdesc: _("Score"), + shortdesc: _("Kind"), longdesc: _('Positive values indicate the resources should run on this node. Negative values indicate the resources should not run on this node. Values of +/- INFINITY change "should"/"should not" to "must"/"must not".'), default: "INFINITY", }, diff --git a/hawk/app/validators/colocation_validator.rb b/hawk/app/validators/colocation_validator.rb index 82b7975e6..0a9cf8939 100644 --- a/hawk/app/validators/colocation_validator.rb +++ b/hawk/app/validators/colocation_validator.rb @@ -12,11 +12,11 @@ def validate(record) "-infinity" ].include? record.score.downcase unless record.score.match(/^-?[0-9]+$/) - record.errors[:score] << _("Invalid score value") + record.errors[:score] << _("Invalid kind value") end end else - record.errors[:score] << _("Score is required") + record.errors[:score] << _("Kind is required") end unless record.node_attr.blank? diff --git a/hawk/app/validators/order_validator.rb b/hawk/app/validators/order_validator.rb index 8cccd70eb..41e4fdcdf 100644 --- a/hawk/app/validators/order_validator.rb +++ b/hawk/app/validators/order_validator.rb @@ -13,11 +13,11 @@ def validate(record) "-infinity" ].include? record.score.downcase unless record.score.match(/^-?[0-9]+$/) - record.errors[:score] << _("Invalid score value") + record.errors[:score] << _("Invalid kind value") end end else - record.errors[:score] << _("Score is required") + record.errors[:score] << _("Kind is required") end if record.resources.length < 2 diff --git a/hawk/app/views/colocations/_form.html.erb b/hawk/app/views/colocations/_form.html.erb index f07944afc..228691b8e 100644 --- a/hawk/app/views/colocations/_form.html.erb +++ b/hawk/app/views/colocations/_form.html.erb @@ -9,7 +9,7 @@ <% end %>
diff --git a/hawk/app/views/locations/_form.html.erb b/hawk/app/views/locations/_form.html.erb index 9801760d3..179079f9e 100644 --- a/hawk/app/views/locations/_form.html.erb +++ b/hawk/app/views/locations/_form.html.erb @@ -29,7 +29,7 @@
diff --git a/hawk/app/views/resources/show.html.erb b/hawk/app/views/resources/show.html.erb index ed16d6d6e..36b9b8857 100644 --- a/hawk/app/views/resources/show.html.erb +++ b/hawk/app/views/resources/show.html.erb @@ -279,7 +279,7 @@ <%= _("Type") %> - <%= _("Score") %> + <%= _("Kind") %> <%= _("To") %> diff --git a/hawk/config/help/en-US/constraints/colocation.md b/hawk/config/help/en-US/constraints/colocation.md index 79fc32ec1..66995db97 100644 --- a/hawk/config/help/en-US/constraints/colocation.md +++ b/hawk/config/help/en-US/constraints/colocation.md @@ -4,17 +4,17 @@ A colocational constraint tells the cluster which resources may or may not run together on a node. To create a location constraint, specify an ID, select the resources between -which to define the constraint, and add a score. The score determines the +which to define the constraint, and add a kind. The kind determines the location relationship between the resources. * Positive values: The resources should run on the same node. * Negative values: The resources should not run on the same node. -* Score of INFINITY: The resources have to run on the same node. -* Score of -INFINITY: The resources must not run on the same node. +* Kind of INFINITY: The resources have to run on the same node. +* Kind of -INFINITY: The resources must not run on the same node. An example for use of a colocation constraint is a Web service that depends on an IP address. Configure individual resources for the IP address and the Web -service, then add a colocation constraint with a score of INFINITY. It defines +service, then add a colocation constraint with a kind of INFINITY. It defines that the Web service must run on the same node as the IP address. This also means that if the IP address is not running on any node, the Web service will not be permitted to run. diff --git a/hawk/config/help/en-US/constraints/location.md b/hawk/config/help/en-US/constraints/location.md index a9437c1e6..5b8309467 100644 --- a/hawk/config/help/en-US/constraints/location.md +++ b/hawk/config/help/en-US/constraints/location.md @@ -4,10 +4,10 @@ A location constraint defines on which node a resource may be run, is preferred to be run, or may not be run. To create a location constraint, specify an ID, select the resource -for which to define the constraint, a score and node. The score +for which to define the constraint, a kind and node. The kind indicates the value you are assigning to this resource -constraint. Constraints with higher scores are applied before those -with lower scores. +constraint. Constraints with higher kinds are applied before those +with lower kinds. An example of a location constraint is to place all resources related to a certain database on the same node. diff --git a/hawk/config/help/en-US/constraints/order.md b/hawk/config/help/en-US/constraints/order.md index bf2ae9cf0..e653881f2 100644 --- a/hawk/config/help/en-US/constraints/order.md +++ b/hawk/config/help/en-US/constraints/order.md @@ -4,9 +4,9 @@ Ordering constraints define the order in which resources are started and stopped. To create an order constraint, specify an ID, select the resources -between which to define the constraint, and add a score. The score +between which to define the constraint, and add a kind. The kind determines the location relationship between the resources: The -constraint is mandatory if the score is greater than zero, otherwise +constraint is mandatory if the kind is greater than zero, otherwise it is only a suggestion. The default value is INFINITY. Keeping the option `Symmetrical` set to `Yes` (default) defines that the resources are stopped in reverse order. diff --git a/hawk/locale/ar/hawk.po b/hawk/locale/ar/hawk.po index 77188e330..6fd3a893a 100644 --- a/hawk/locale/ar/hawk.po +++ b/hawk/locale/ar/hawk.po @@ -486,7 +486,7 @@ msgstr "القاعدة" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "النتيجة" #: ../app/assets/javascripts/module/location.js:41 @@ -2187,11 +2187,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "المعرف \"%{id}\"غير موجود" #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "النقاط مطلوبة" #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "قيمة النقاط غير صالحة" #: ../app/models/colocation.rb:30 @@ -2203,7 +2203,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "يجب أن يتكون القيد من موردين منفصلين على الأقل" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "تحدد النتيجة علاقة الموقع بين الموارد." #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2318,7 +2318,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "القيد معقد للغاية - يحتوي على قواعد مضمنة" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "نتيجة غير صحيحة \"%{score}\"" #: ../app/models/location.rb:43 diff --git a/hawk/locale/cs/hawk.po b/hawk/locale/cs/hawk.po index 0c18897ea..ed7f261e1 100644 --- a/hawk/locale/cs/hawk.po +++ b/hawk/locale/cs/hawk.po @@ -487,7 +487,7 @@ msgstr "Pravidlo" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "Skóre" #: ../app/assets/javascripts/module/location.js:41 @@ -2198,11 +2198,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "ID %{id} neexistuje." #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "Je požadováno skóre." #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "Hodnota skóre není platná." #: ../app/models/colocation.rb:30 @@ -2214,7 +2214,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "Omezení musí obsahovat alespoň dva samostatné prostředky" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "Skóre určuje vzájemné umístění prostředků." #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2337,7 +2337,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "Omezení je příliš složité – obsahuje vnořená pravidla" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "Neplatné skóre „%{score}“" #: ../app/models/location.rb:43 diff --git a/hawk/locale/de/hawk.po b/hawk/locale/de/hawk.po index 2e98fa8d1..011c0a5da 100644 --- a/hawk/locale/de/hawk.po +++ b/hawk/locale/de/hawk.po @@ -488,7 +488,7 @@ msgstr "Regel" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "Note" #: ../app/assets/javascripts/module/location.js:41 @@ -2218,11 +2218,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "Die ID \"%{id}\" ist nicht vorhanden" #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "Note erforderlich" #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "Ungültige Note" #: ../app/models/colocation.rb:30 @@ -2234,7 +2234,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "Die Einschränkung muss mindestens zwei separate Ressourcen enthalten" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "Die Note bestimmt die Standortbeziehung zwischen den Ressourcen." #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2358,7 +2358,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "Die Einschränkung ist zu komplex - sie enthält verschachtelte Regeln" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "Ungültige Note \"%{score}\"" #: ../app/models/location.rb:43 diff --git a/hawk/locale/es/hawk.po b/hawk/locale/es/hawk.po index bef517db3..cc69c1cef 100644 --- a/hawk/locale/es/hawk.po +++ b/hawk/locale/es/hawk.po @@ -489,7 +489,7 @@ msgstr "Regla" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "Puntuación" #: ../app/assets/javascripts/module/location.js:41 @@ -2215,11 +2215,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "El ID \"%{id}\" no existe." #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "Se requiere la puntuación." #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "Valor de puntuación no válido" #: ../app/models/colocation.rb:30 @@ -2231,7 +2231,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "La restricción debe consistir en al menos dos recursos independientes" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "La puntuación determina la relación de ubicación entre los recursos." #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2354,7 +2354,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "La restricción es demasiado compleja, contiene reglas anidadas" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "Puntuación no válida %{score}" #: ../app/models/location.rb:43 diff --git a/hawk/locale/fr/hawk.po b/hawk/locale/fr/hawk.po index 18e3f657e..f5903fb86 100644 --- a/hawk/locale/fr/hawk.po +++ b/hawk/locale/fr/hawk.po @@ -489,8 +489,8 @@ msgstr "Règle" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" -msgstr "Score" +msgid "Kind" +msgstr "Kind" #: ../app/assets/javascripts/module/location.js:41 #: ../app/models/location.rb:248 @@ -2221,11 +2221,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "L'ID \"%{id}\" n'existe pas." #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "Le score est requis." #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "Valeur de score non valide" #: ../app/models/colocation.rb:30 @@ -2237,7 +2237,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "La contrainte doit contenir au moins deux ressources distinctes." #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "Le score détermine la relation de l'emplacement entre les ressources." #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2359,7 +2359,7 @@ msgstr "" "La contrainte est trop complexe car elle contient des règles imbriquées." #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "Score \"%{score}\" non valide" #: ../app/models/location.rb:43 diff --git a/hawk/locale/hawk.pot b/hawk/locale/hawk.pot index 6f4ca7ba0..bf1f7dc97 100644 --- a/hawk/locale/hawk.pot +++ b/hawk/locale/hawk.pot @@ -237,7 +237,7 @@ msgid "Rule" msgstr "" #: ../app/assets/javascripts/module/location.js:33 ../app/models/colocation.rb:180 ../app/models/location.rb:229 ../app/views/colocations/_form.html.erb:12 ../app/views/locations/_form.html.erb:32 ../app/views/orders/_form.html.erb:12 ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "" #: ../app/assets/javascripts/module/location.js:41 ../app/models/location.rb:248 @@ -1565,11 +1565,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "" #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "" #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "" #: ../app/models/colocation.rb:30 @@ -1581,7 +1581,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "" #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -1661,7 +1661,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "" #: ../app/models/location.rb:43 diff --git a/hawk/locale/hu/hawk.po b/hawk/locale/hu/hawk.po index 11e6332f2..ee13a8b80 100644 --- a/hawk/locale/hu/hawk.po +++ b/hawk/locale/hu/hawk.po @@ -490,7 +490,7 @@ msgstr "Szabály" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "Pontszám" #: ../app/assets/javascripts/module/location.js:41 @@ -2206,11 +2206,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "A(z) \"%{id}\" azonosító nem létezik" #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "A pontszám megadása kötelező" #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "Érvénytelen pontszámérték" #: ../app/models/colocation.rb:30 @@ -2222,7 +2222,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "A szabálynak legalább két különböző erőforrást kell tartalmaznia" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "A pontszám határozza meg az erőforrások közötti helykapcsolatot." #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2342,7 +2342,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "Túl komplex szabály - beágyazott szabályok vannak" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "Érvénytelen pontszám \"%{score}\"" #: ../app/models/location.rb:43 diff --git a/hawk/locale/it/hawk.po b/hawk/locale/it/hawk.po index c3b815816..2acd501c9 100644 --- a/hawk/locale/it/hawk.po +++ b/hawk/locale/it/hawk.po @@ -490,7 +490,7 @@ msgstr "Regola" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "Punteggio" #: ../app/assets/javascripts/module/location.js:41 @@ -2217,11 +2217,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "L'ID \"%{id}\" non esiste" #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "È richiesto il punteggio" #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "Valore punteggio non valido" #: ../app/models/colocation.rb:30 @@ -2233,7 +2233,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "Il vincolo deve essere costituito da almeno due risorse separate" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "Il punteggio determina la relazione dell'ubicazione tra le risorse." #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2354,7 +2354,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "Il vincolo è troppo complesso: contiene regole nidificate" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "Punteggio non valido \"%{score}\"" #: ../app/models/location.rb:43 diff --git a/hawk/locale/ja/hawk.po b/hawk/locale/ja/hawk.po index a7b62027c..3698b2800 100644 --- a/hawk/locale/ja/hawk.po +++ b/hawk/locale/ja/hawk.po @@ -486,7 +486,7 @@ msgstr "ルール" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "スコア" #: ../app/assets/javascripts/module/location.js:41 @@ -2188,11 +2188,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "タグID「%{id}」が存在しません" #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "スコアが必要です" #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "無効なスコア値" #: ../app/models/colocation.rb:30 @@ -2204,7 +2204,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "制約は2つ以上の別のリソースから構成される必要があります" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "このスコアによって、リソース間の位置関係が指定されます。" #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2319,7 +2319,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "制約が複雑すぎます。ネストしたルールが含まれています" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "無効なスコア「%{score}」" #: ../app/models/location.rb:43 diff --git a/hawk/locale/ko/hawk.po b/hawk/locale/ko/hawk.po index b2d10a156..51f06b249 100644 --- a/hawk/locale/ko/hawk.po +++ b/hawk/locale/ko/hawk.po @@ -486,7 +486,7 @@ msgstr "규칙" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "점수" #: ../app/assets/javascripts/module/location.js:41 @@ -2188,11 +2188,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "ID \"%{id}\"이(가) 없습니다." #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "점수가 필요합니다." #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "잘못된 점수 값" #: ../app/models/colocation.rb:30 @@ -2204,7 +2204,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "제약 조건은 2개 이상의 개별 리소스로 구성되어야 합니다." #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "점수는 리소스 간의 로케이션 관계를 결정합니다." #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2319,7 +2319,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "제약 조건이 너무 복잡합니다. 중첩 규칙을 포함합니다." #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "점수 \"%{score}\"이(가) 잘못되었습니다." #: ../app/models/location.rb:43 diff --git a/hawk/locale/nl/hawk.po b/hawk/locale/nl/hawk.po index 2e7ea87b5..27d8f6868 100644 --- a/hawk/locale/nl/hawk.po +++ b/hawk/locale/nl/hawk.po @@ -490,8 +490,8 @@ msgstr "Regel" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" -msgstr "Score" +msgid "Kind" +msgstr "Kind" #: ../app/assets/javascripts/module/location.js:41 #: ../app/models/location.rb:248 @@ -2213,11 +2213,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "Id \"%{id}\" bestaat niet" #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "Score is vereist" #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "Ongeldige scorewaarde" #: ../app/models/colocation.rb:30 @@ -2229,7 +2229,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "Beperking moet uit minimaal twee afzonderlijke bronnen bestaan" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "De score bepaalt de relatie tussen de locaties van de resources." #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2356,7 +2356,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "Beperking is te complex: deze bevat geneste regels" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "Ongeldige score \"%{score}\"" #: ../app/models/location.rb:43 diff --git a/hawk/locale/pl/hawk.po b/hawk/locale/pl/hawk.po index 11e4bc186..b5960a36f 100644 --- a/hawk/locale/pl/hawk.po +++ b/hawk/locale/pl/hawk.po @@ -493,7 +493,7 @@ msgstr "Reguła" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "Punkty" #: ../app/assets/javascripts/module/location.js:41 @@ -2217,11 +2217,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "Identyfikator %{id} nie istnieje" #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "Punktacja jest wymagana" #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "Nieprawidłowa wartość punktacji" #: ../app/models/colocation.rb:30 @@ -2233,7 +2233,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "Ograniczenie musi zawierać co najmniej dwa oddzielne zasoby" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "Punktacja określa relację położeń między zasobami." #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2352,7 +2352,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "Ograniczenie jest zbyt złożone - zawiera zagnieżdżone reguły" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "Nieprawidłowa wartości punktowa \"%{score}\"" #: ../app/models/location.rb:43 diff --git a/hawk/locale/pt_BR/hawk.po b/hawk/locale/pt_BR/hawk.po index 56e900084..65d093a09 100644 --- a/hawk/locale/pt_BR/hawk.po +++ b/hawk/locale/pt_BR/hawk.po @@ -489,7 +489,7 @@ msgstr "Regra" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "Pontuação" #: ../app/assets/javascripts/module/location.js:41 @@ -2200,11 +2200,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "O ID \"%{id}\" não existe" #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "Pontuação obrigatória" #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "Valor de pontuação inválido" #: ../app/models/colocation.rb:30 @@ -2216,7 +2216,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "A restrição deve consistir em pelo menos dois recursos separados" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "A pontuação determina o relacionamento de local entre os recursos." #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2336,7 +2336,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "Restrição complexa demais; contém regras aninhadas" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "Pontuação \"%{score}\" inválida" #: ../app/models/location.rb:43 diff --git a/hawk/locale/ru/hawk.po b/hawk/locale/ru/hawk.po index 0973170d0..43d2cce8a 100644 --- a/hawk/locale/ru/hawk.po +++ b/hawk/locale/ru/hawk.po @@ -491,7 +491,7 @@ msgstr "Правило" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "Оценка" #: ../app/assets/javascripts/module/location.js:41 @@ -2199,11 +2199,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "ИД \"%{id}\" не существует" #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "Требуется оценка" #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "Недопустимое значение оценки" #: ../app/models/colocation.rb:30 @@ -2215,7 +2215,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "Ограничение должно состоять как минимум из двух отдельных ресурсов" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "Показатель определяет отношение расположений между ресурсами." #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2340,7 +2340,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "Слишком сложное ограничение - содержит вложенные правила" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "Недопустимая оценка: \"%{score}\"" #: ../app/models/location.rb:43 diff --git a/hawk/locale/sv/hawk.po b/hawk/locale/sv/hawk.po index 07112a071..5cc1246af 100644 --- a/hawk/locale/sv/hawk.po +++ b/hawk/locale/sv/hawk.po @@ -488,7 +488,7 @@ msgstr "Regel" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "Poäng" #: ../app/assets/javascripts/module/location.js:41 @@ -2198,11 +2198,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "ID:t \"%{id}\" finns inte" #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "Poäng krävs" #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "Ogiltigt poängvärde" #: ../app/models/colocation.rb:30 @@ -2214,7 +2214,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "Begränsningen måste bestå av minst två separata resurser" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "Poängen avgör platsförhållandet mellan resurserna." #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2329,7 +2329,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "Begränsningen är för komplex - den innehåller kapslade regler" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "Ogiltig poäng \"%{score}\"" #: ../app/models/location.rb:43 diff --git a/hawk/locale/zh_CN/hawk.po b/hawk/locale/zh_CN/hawk.po index 5a593bcec..31c58b5a4 100644 --- a/hawk/locale/zh_CN/hawk.po +++ b/hawk/locale/zh_CN/hawk.po @@ -484,7 +484,7 @@ msgstr "规则" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "分数" #: ../app/assets/javascripts/module/location.js:41 @@ -2175,11 +2175,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "ID“%{id}”不存在" #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "需要指定分数" #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "分数值无效" #: ../app/models/colocation.rb:30 @@ -2191,7 +2191,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "约束必须包含至少两个独立资源" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "该分数可以确定资源之间的位置关系。" #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2299,7 +2299,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "约束过于复杂 - 它包含嵌套规则" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "分数“%{score}”无效" #: ../app/models/location.rb:43 diff --git a/hawk/locale/zh_TW/hawk.po b/hawk/locale/zh_TW/hawk.po index 6db9208bb..3f2ac560a 100644 --- a/hawk/locale/zh_TW/hawk.po +++ b/hawk/locale/zh_TW/hawk.po @@ -484,7 +484,7 @@ msgstr "規則" #: ../app/views/locations/_form.html.erb:32 #: ../app/views/orders/_form.html.erb:12 #: ../app/views/resources/show.html.erb:282 -msgid "Score" +msgid "Kind" msgstr "分數" #: ../app/assets/javascripts/module/location.js:41 @@ -2175,11 +2175,11 @@ msgid "The ID \"%{id}\" does not exist" msgstr "ID「%{id}」不存在" #: ../app/models/colocation.rb:10 ../app/models/order.rb:10 -msgid "Score is required" +msgid "Kind is required" msgstr "需要指定分數" #: ../app/models/colocation.rb:24 ../app/models/order.rb:25 -msgid "Invalid score value" +msgid "Invalid kind value" msgstr "分數值無效" #: ../app/models/colocation.rb:30 @@ -2191,7 +2191,7 @@ msgid "Constraint must consist of at least two separate resources" msgstr "條件約束必須至少包含兩個獨立的資源" #: ../app/models/colocation.rb:181 -msgid "The score determines the location relationship between the resources." +msgid "The kind determines the location relationship between the resources." msgstr "該分數可用於判斷資源間的位置關係。" #: ../app/models/colocation.rb:186 ../app/views/colocations/_form.html.erb:52 @@ -2299,7 +2299,7 @@ msgid "Constraint is too complex - it contains nested rules" msgstr "條件約束過於複雜,它含有巢狀規則" #: ../app/models/location.rb:33 -msgid "Invalid score \"%{score}\"" +msgid "Invalid kind \"%{score}\"" msgstr "分數「%{score}」無效" #: ../app/models/location.rb:43 diff --git a/hawk/spec/models/colocation_spec.rb b/hawk/spec/models/colocation_spec.rb index cddf408ee..9ee371627 100644 --- a/hawk/spec/models/colocation_spec.rb +++ b/hawk/spec/models/colocation_spec.rb @@ -2,19 +2,19 @@ describe Colocation do context 'with invalid values' do - it 'with blank score' do + it 'with blank kind' do record = Colocation.new record.score = "" record.valid? #run validation - record.errors[:score].should include("Score is required") - record.errors[:score].should_not include("Invalid score value") + record.errors[:score].should include("Kind is required") + record.errors[:score].should_not include("Invalid kind value") end - it 'with invalid score' do + it 'with invalid kind' do record = Colocation.new record.score = "lol" record.valid? - record.errors[:score].should include("Invalid score value") - record.errors[:score].should_not include("Score is required") + record.errors[:score].should include("Invalid kind value") + record.errors[:score].should_not include("Kind is required") end it 'with blank resources' do record = Colocation.new @@ -43,7 +43,7 @@ record = Colocation.new record.score = "infinity" record.valid? - record.errors[:score].should_not include("Invalid score value", "Score is required") + record.errors[:score].should_not include("Invalid kind value", "Kind is required") end it 'with valid resources' do record = Colocation.new @@ -58,7 +58,7 @@ record.id = "foo" record.valid? record.errors[:id].should_not include("ID is required") - record.errors[:score].should include("Score is required") + record.errors[:score].should include("Kind is required") end it 'provide everything' do record = Colocation.new diff --git a/hawk/spec/models/order_spec.rb b/hawk/spec/models/order_spec.rb index 4b20a8a2a..a99381321 100644 --- a/hawk/spec/models/order_spec.rb +++ b/hawk/spec/models/order_spec.rb @@ -2,19 +2,19 @@ describe Order do context 'with invalid values' do - it 'with blank score' do + it 'with blank kind' do record = Order.new record.score = "" record.valid? #run validation - record.errors[:score].should include("Score is required") - record.errors[:score].should_not include("Invalid score value") + record.errors[:score].should include("Kind is required") + record.errors[:score].should_not include("Invalid kind value") end - it 'with invalid score' do + it 'with invalid kind' do record = Order.new record.score = "lol" record.valid? - record.errors[:score].should include("Invalid score value") - record.errors[:score].should_not include("Score is required") + record.errors[:score].should include("Invalid kind value") + record.errors[:score].should_not include("Kind is required") end it 'with blank resources' do record = Order.new @@ -41,7 +41,7 @@ record = Order.new record.score = "serialize" record.valid? - record.errors[:score].should_not include("Invalid score value", "Score is required") + record.errors[:score].should_not include("Invalid kind value", "Kind is required") end it 'with valid resources' do record = Order.new @@ -55,7 +55,7 @@ record.id = "foo" record.valid? record.errors[:id].should_not include("ID is required") - record.errors[:score].should include("Score is required") + record.errors[:score].should include("Kind is required") end it 'provide everything' do record = Order.new