diff --git a/app/models/talk.rb b/app/models/talk.rb index a57eef2..2b06034 100644 --- a/app/models/talk.rb +++ b/app/models/talk.rb @@ -1,7 +1,7 @@ class Talk < ActiveResource::Base has_many :selections, class_name: 'SelectedTalk' - self.site = "https://cfp.openfest.org/api/conferences/4" + self.site = "https://cfp.openfest.org/api/conferences/5" self.element_name = "event" def self.ordered_by_id diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 0e1d99a..1677616 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -72,10 +72,10 @@
-

Technical

-

OpenBiz

-

Civic Hacking

-

Social

-

OpenArt

-

Advanced Technical

-

Education

+

Technical

+

OpenBiz

+

Civic Hacking

+

Social

+

OpenArt

+

Advanced Technical

+

Education

diff --git a/config/locales/bg.yml b/config/locales/bg.yml index d5528ca..dd83b6b 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1,6 +1,6 @@ bg: generic: - title: Възможни лекции за OpenFest 2017 + title: Възможни лекции за OpenFest 2018 submit: Изпрати store_and_submit_changes: Запази локално промените и ги изпрати, ако е възможно help_us_reduce_the_conflicts: Помогнете ни да намалим конфликтите в програмата на OpenFest diff --git a/config/locales/en.yml b/config/locales/en.yml index f1f5d98..fd36026 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,6 +1,6 @@ en: generic: - title: OpenFest 2017 Talk Preference Poll + title: OpenFest 2018 Talk Preference Poll submit: Submit store_and_submit_changes: Store your changes locally and submit them if possible help_us_reduce_the_conflicts: "Help us to reduce the conflicts in OpenFest's schedule"