diff --git a/app/models/talk.rb b/app/models/talk.rb index 0d45cfb..b219d79 100644 --- a/app/models/talk.rb +++ b/app/models/talk.rb @@ -1,5 +1,5 @@ class Talk < ActiveResource::Base - self.site = "https://cfp.openfest.org/api/conferences/2" + self.site = "https://cfp.openfest.org/api/conferences/3" self.element_name = "event" def self.ordered_by_rating diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 6e12eb4..fe1bba8 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -54,9 +54,10 @@ -

Technical

-

OpenBiz

-

Civic Hacking

-

Social

-

OpenArt

-

Advanced Technical

+

Technical

+

OpenBiz

+

Civic Hacking

+

Social

+

OpenArt

+

Advanced Technical

+

Education

diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 02869b6..c00638d 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1,6 +1,6 @@ bg: generic: - title: Гласуване за лекции на OpenFest 2015 + title: Възможни лекции за OpenFest 2016 submit: Изпрати store_and_submit_changes: Запази локално промените и ги изпрати, ако е възможно help_us_reduce_the_conflicts: Помогнете ни да намалим конфликтите в програмата на OpenFest diff --git a/config/locales/en.yml b/config/locales/en.yml index b64d4e3..8faae30 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,6 +1,6 @@ en: generic: - title: OpenFest 2015 Talk Preference Poll + title: OpenFest 2016 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"