Skip to content

Commit a969d50

Browse files
authored
Merge pull request #66 from internetee/1703-i18zed-whois-disclaimer
Change disclaimer field to use i18zed from registry
2 parents ad25d2d + d13ee63 commit a969d50

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

app/views/whois_record/inactive.erb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
<%- if json['disclaimer'].present? -%>
1+
<%- if json['disclaimer'].present? && json['disclaimer'].is_a?(String) -%>
22
<%= json['disclaimer'].scan(/\S.{0,72}\S(?=\s|$)|\S+/).join("\n") %>
3-
3+
<%- elsif json['disclaimer'].present? && json['disclaimer'].is_a?(Hash) -%>
4+
<%= json.dig('disclaimer', I18n.locale.to_s).scan(/\S.{0,72}\S(?=\s|$)|\S+/).join("\n") %>
45
<%- end -%>
6+
57
Estonia .ee Top Level Domain WHOIS server
68

79
Domain:

app/views/whois_record/legal_person.erb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
<%- if json['disclaimer'].present? -%>
1+
<%- if json['disclaimer'].present? && json['disclaimer'].is_a?(String) -%>
22
<%= json['disclaimer'].scan(/\S.{0,72}\S(?=\s|$)|\S+/).join("\n") %>
3-
3+
<%- elsif json['disclaimer'].present? && json['disclaimer'].is_a?(Hash) -%>
4+
<%= json.dig('disclaimer', I18n.locale.to_s).scan(/\S.{0,72}\S(?=\s|$)|\S+/).join("\n") %>
45
<%- end -%>
6+
57
Estonia .ee Top Level Domain WHOIS server
68

79
Domain:

app/views/whois_record/private_person.erb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
<%- if json['disclaimer'].present? -%>
1+
<%- if json['disclaimer'].present? && json['disclaimer'].is_a?(String) -%>
22
<%= json['disclaimer'].scan(/\S.{0,72}\S(?=\s|$)|\S+/).join("\n") %>
3-
3+
<%- elsif json['disclaimer'].present? && json['disclaimer'].is_a?(Hash) -%>
4+
<%= json.dig('disclaimer', I18n.locale.to_s).scan(/\S.{0,72}\S(?=\s|$)|\S+/).join("\n") %>
45
<%- end -%>
6+
57
Estonia .ee Top Level Domain WHOIS server
68

79
Domain:

test/models/private_person_record_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def create_private_person_record
105105
],
106106
changed: "2018-04-25T14:10:41+03:00",
107107
delete: nil,
108-
disclaimer: "The information obtained through .ee WHOIS is subject to database protection according to the Estonian Copyright Act and international conventions. All rights are reserved to Estonian Internet Foundation. Search results may not be used for commercial,advertising, recompilation, repackaging, redistribution, reuse, obscuring or other similar activities. Downloading of information about domain names for the creation of your own database is not permitted. If any of the information from .ee WHOIS is transferred to a third party, it must be done in its entirety. This server must not be used as a backend for a search engine.",
108+
disclaimer: { en: "The information obtained through .ee WHOIS is subject to database protection according to the Estonian Copyright Act and international conventions. All rights are reserved to Estonian Internet Foundation. Search results may not be used for commercial,advertising, recompilation, repackaging, redistribution, reuse, obscuring or other similar activities. Downloading of information about domain names for the creation of your own database is not permitted. If any of the information from .ee WHOIS is transferred to a third party, it must be done in its entirety. This server must not be used as a backend for a search engine." },
109109
dnssec_changed: nil,
110110
dnssec_keys: [
111111

0 commit comments

Comments
 (0)