diff --git a/app/views/aspects/_aspect_stream.haml b/app/views/aspects/_aspect_stream.haml index 60c62e97e..0353c4ccf 100644 --- a/app/views/aspects/_aspect_stream.haml +++ b/app/views/aspects/_aspect_stream.haml @@ -4,7 +4,7 @@ = render 'shared/publisher', :aspect => aspect, :aspect_ids => aspect_ids -.prepend-11 +#sort_by = t('.sort_by') = link_to_if(session[:sort_order] == 'created_at', t('.activity'), aspects_path(:a_ids => params[:a_ids], :sort_order => 'updated_at')) | diff --git a/config/locale_settings.yml b/config/locale_settings.yml index e012805f1..399f9d3d9 100644 --- a/config/locale_settings.yml +++ b/config/locale_settings.yml @@ -1,38 +1,38 @@ default: 'en' available: - ca: "Català" - cs: 'Čeština' - cy: 'Cymraeg' - da: 'Dansk' - de: 'Deutsch' - el: "Ελληνικά" - en: 'English' - en_shaw: '𐑦𐑙𐑤𐑦𐑖' - es: 'Español' - es-CL: 'Español Chileno' - eu: 'Euskara' - fi: 'Suomi' - fr: 'Français' - ga: 'Gaeilge' - gl: 'Galego' - he: 'עברית' - hu: 'magyar nyelv' - id: 'Bahasa Indonesia' - is: 'íslenska' - it: 'Italiano' - lt: 'Lietuviškai' - mk: 'македонски' - nb: 'Norske' - nl: 'Nederlands' - pl: "Polski" - pt-BR: 'Português' - ro: 'Română' - ru: 'Русский' - sl: 'Slovenščina' - sk: 'Slovenčina' - sv: 'Svenska' - tr: 'Türk' - zh: '中文' + ca: "Català" + cs: 'Čeština' + cy: 'Cymraeg' + da: 'Dansk' + de: 'Deutsch' + el: "Ελληνικά" + en: 'English' + en_shaw: '𐑦𐑙𐑤𐑦𐑖' + es: 'Español' + es-CL: 'Español Chileno' + eu: 'Euskara' + fi: 'Suomi' + fr: 'Français' + ga: 'Gaeilge' + gl: 'Galego' + he: 'עברית' + hu: 'magyar nyelv' + id: 'Bahasa Indonesia' + is: 'íslenska' + it: 'Italiano' + lt: 'Lietuviškai' + mk: 'македонски' + nb: 'Norske' + nl: 'Nederlands' + pl: "Polski" + pt-BR: 'Português' + ro: 'Română' + ru: 'Русский' + sl: 'Slovenščina' + sk: 'Slovenčina' + sv: 'Svenska' + tr: 'Türk' + zh: '中文' fallbacks: en-GB: [:en] en-US: [:en] diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index d6bda9609..5a2fa81d0 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -2460,3 +2460,6 @@ ul.show_comments .webfinger_form input[type='search'] :width 100% + +#sort_by + :text-align right