Skip to content

Commit

Permalink
Updated info text
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergei Tsoganov authored and Sergei Tsoganov committed Sep 12, 2023
1 parent f3e3dfc commit a4f20fd
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 21 deletions.
8 changes: 8 additions & 0 deletions app/helpers/auctions_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ def faq_link
end
end

def reserved_domain_names_link
if I18n.locale == :en
'https://www.internet.ee/eif/news/auction-schedule-of-reserved-domains'
elsif I18n.locale == :et
'https://www.internet.ee/eis/uudised/reserveeritud-domeenide-oksjonite-kava'
end
end

def domain_name_with_embedded_colors(domain_name)
new_domain_name = domain_name.gsub(/([0-9]+)/, "<span class='number-in-domain-name'>\\1</span>")
sanitize(new_domain_name)
Expand Down
3 changes: 2 additions & 1 deletion app/views/auctions/_top_grid.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
<p><%= t(".footer_html",
terms_and_conditions_link: link_to(t(".terms_and_conditions_link"),
Setting.find_by(code: 'terms_and_conditions_link').retrieve),
faq_link: link_to(t(".faq_link"), faq_link)) %></p>
faq_link: link_to(t(".faq_link"), faq_link),
reserved_domain_names_link: link_to(t(".reserved_domain_names_link"), reserved_domain_names_link)) %></p>
</div>
</div>
</div>
18 changes: 7 additions & 11 deletions config/locales/auctions.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,28 +66,24 @@ en:
title: "Domains in auction:"
1_step_header: "Submit an offer"
1_step_explanation: |
you can change or remove offers at any time during the auction.
Offers are confidential.
to the .ee domain of your choice. Depending on the domain name, the auctions take place either in the style of a blind auction or an open-bid auction.
2_step_header: "Wait for auction to end"
2_step_header: "Wait for an auction to end"
2_step_explanation: |
We will let you know about the result by email.
Hopefully your offer was the highest and you will get
the reservation to register the domain name.
The preferential right to register the domain name will be granted to the highest bidder.
3_step_header: "Pay auction fee"
3_step_explanation: |
Once the fee is paid, you will receive a registration code that you
can use at any accredited registrar.
Once the fee is paid, you will receive a registration code that you can use at any accredited registrar.
please_note: |
NB. Please note that you will receive priority right to register the domain!
Upon registration, you will also be charged a domain registration fee based on
your chosen registrar's price list.
NB! Please note that you will receive priority right to register the domain! Upon registration, you will also be charged a domain registration fee based on your chosen registrar's price list.
footer_html: "Please check out the %{terms_and_conditions_link} of .ee %{faq_link}."
footer_html: "Please check out the %{terms_and_conditions_link} of the .ee %{faq_link}. You can find the schedule of the reserved domain names from %{reserved_domain_names_link}!"
terms_and_conditions_link: "terms and conditions"
faq_link: "auctioning process"
reserved_domain_names_link: "here"

english_bottom_grid:
title: "Auction rules"
Expand Down
20 changes: 11 additions & 9 deletions config/locales/auctions.et.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,30 +62,32 @@ et:

top_grid:
title: "Oksjonil olevad domeenid:"
1_step_header: "Esita pakkumus,"
1_step_header: "Esita pakkumus"
1_step_explanation: |
mida saad muuta ja tühistada oksjoni lõppemiseni.
Domeenioksjonid toimuvad pimeoksjoni stiilis, mis tähendab,
et keegi teine esitatud pakkumise suurust ei näe.
enda poolt valitud meelepärasele domeenile.
Oksjonid toimuvad vastavalt domeeni tüübile kas pimeoksjoni
või avatud pakkumistega oksjoni stiilis.
2_step_header: "Oota oksjoni lõppemiseni"
2_step_explanation: |
Anname oksjonitulemustest teada ka e-posti teel. Loodetavasti on sinu
pakkumine kõrgeim ja saad õiguse soovitud domeeninime registreerimiseks.
Anname oksjoni tulemustest teada ka e-posti teel.
Domeeninime registreerimise õiguse saab isik, kelle pakkumine on kõige kõrgem.
3_step_header: "Maksa oksjonitasu"
3_step_explanation: |
Kui tasu on makstud, saadetakse sulle registreerimiskood,
mida saad kasutada .ee akrediteeritud registripidaja juures
mida saad kasutada .ee akrediteeritud registripidaja juures.
please_note: |
NB Juhime tähelepanu, et oksjonilt soetad domeeni registreerimise eelisõiguse!
NB! Juhime tähelepanu, et oksjonilt soetad domeeni registreerimise eelisõiguse!
Domeeni registreerimisel lisandub teie valitud registripidaja hinnakirja alusel
ka domeeni registreerimise tasu.
footer_html: "Tutvu ka %{terms_and_conditions_link} ja loe %{faq_link}."
footer_html: "Tutvu ka %{terms_and_conditions_link} ja loe %{faq_link}. Avatud pakkumistega inglise oksjonile tulevate domeenide ajakava leiad %{reserved_domain_names_link}!"
terms_and_conditions_link: "oksjonikeskkonna kasutajatingimustega"
faq_link: "detailsemalt oksjoniprotsessist"
reserved_domain_names_link: "siit"


english_bottom_grid:
title: "Oksjoni eeskirjad"
Expand Down

0 comments on commit a4f20fd

Please sign in to comment.