Added dark theme,added Galician translation,improved Japanese translation,links to posts open in Halcyon,...

README.md

@@ -15,6 +15,7 @@ We moved our instances list to a wiki page: https://notabug.org/halcyon-suite/ha
 [Help us translating Halcyon into many languages](https://translate.zanata.org/project/view/halcyon)
 
 ## Blog
+- Release of Version 2.0.2 - Added dark theme,improved Japanese translation,added Galician translation,links to posts open in Halcyon now,smaller screens supported
 - Release of Version 2.0.1 - Added the languages Polish,Japanese and Korean,fixed many bugs,automatically mention all participants of discussions
 - [Release of Version 2.0.0 - The biggest changes in detail](https://nikisoft.myblog.de/nikisoft/art/11636651/Halcyon-2-0-0-The-biggest-changes-in-detail)
 - Release of Version 1.2.6 - Report toots supported,disable CW and NFSW,add privacy policy and imprint,move config files,read release notes for more

assets/css/style.css

@@ -126,15 +126,6 @@ background-color: #E8F4FB;
 .status_form.ready {
 background-color: #F2FAFF!important;
 }
-.status_form.ready .status_bottom .status_media_attachment,
-.status_form.ready .status_bottom .status_privacy,
-.status_form.ready .status_bottom .status_emoji {
-color: #7ECEFF!important;
-}
-.status_form.ready .status_bottom .status_CW > span,
-.status_form.ready .status_bottom .status_NSFW > span {
-background-color: #7ECEFF!important;
-}
 .status_form.ready .status_bottom .submit_status_label {
 background-color: #A3D8FF!important;
 pointer-events: none;
@@ -590,6 +581,10 @@ border-bottom: none;
 border-top-right-radius: 5px;
 border-top-left-radius: 5px;
 }
+.timeline_header form {
+border-top-right-radius: 5px;
+border-top-left-radius: 5px;
+}
 .timeline_header .header_items {
 display: flex;
 flex-wrap: nowrap;
@@ -1453,7 +1448,6 @@ padding: 0 5px;
 #header .header_nav_wrap .header_left_box {
 display: flex;
 justify-content: flex-start;
-flex: 2;
 height: 100%;
 }
 #header .header_nav_wrap .header_left_box ul.header_nav_list {
@@ -2496,9 +2490,24 @@ border-bottom-right-radius:4px;
 text-align:center;
 padding:5px;
 transition:0.15s ease-out;
+border:0 solid #189EFC;
 }
 .options li:hover {
 border:0 solid #189EFC;
 border-left-width:5px;
 border-right-width:5px;
 }
+@media(max-width:1199px) {
+#main .profile_nav_wrap .profile_nav {
+width:900px;
+}
+#main .profile_nav_wrap .profile_nav .profile_nav_right {
+width:590px;
+}
+#js-follows_profile {
+width:600px;
+}
+#main .article_wrap {
+width:900px;
+}
+}

assets/js/halcyon/halcyonFunctions.js

@@ -47,14 +47,28 @@ const mstags = $(this).attr('href').match(/https:\/\/.+..+\/tags\/(.+)\/?/);
 if(mstags) {
 $(this).attr('href','/search?q='+mstags[1]);
 }
-const plusers = $(this).attr('href').match(/https:\/\/.+..+\/users\/(.+)\/?/);
+const plusers = $(this).attr('href').match(/https:\/\/.+..+\/users\/([a-zA-Z\d_]+)(\/statuses\/\d+)?/);
-if(plusers) {
+if(plusers && plusers[2] == undefined) {
 $(this).attr('href','/@'+plusers[1]+'@'+$(this).attr('href').split("/")[2]);
 }
-const msusers = $(this).attr('href').match(/https:\/\/.+..+\/@([a-zA-Z\d_]+)\/?/);
+else if(plusers && plusers[2] != undefined) {
-if(msusers && $(this).attr('href').split("/").length == 4) {
+$(this).attr('href',"javascript:openStatus('"+plusers[0]+"')");
+}
+const msusers = $(this).attr('href').match(/https:\/\/.+..+\/@([a-zA-Z\d_]+)(\/\d+)?/);
+if(msusers && msusers[2] == undefined) {
 $(this).attr('href','/@'+msusers[1]+'@'+$(this).attr('href').split("/")[2]);
 }
+else if(msusers && msusers[2] != undefined) {
+$(this).attr('href',"javascript:openStatus('"+msusers[0]+"')");
+}
+const gsstatus = $(this).attr('href').match(/https:\/\/.+..+\/notice\/(\d+)?/);
+if(gsstatus) {
+$(this).attr('href',"javascript:openStatus('"+gsstatus[0]+"')");
+}
+const plstatus = $(this).attr('href').match(/https:\/\/.+..+\/objects\/([\da-z]{8}-[\da-z]{4}-[\da-z]{4}-[\da-z]{4}-[\da-z]{12})?/);
+if(plstatus && plstatus[1] != undefined) {
+$(this).attr('href',"javascript:openStatus('"+plstatus[0]+"')");
+}
 if(localStorage.setting_link_previews == "true") {
 if(!window.cards) {
 cards = new Array();
@@ -282,6 +296,14 @@ $(".js_current_followers_count").text(current_followers_count);
 $(".current_toots_count_link").attr("href", current_statuses_count_link);
 $(".current_following_count_link").attr("href", current_following_count_link);
 $(".current_followers_count_link").attr("href", current_followers_count_link);
+if($(window).width() < 1200) {
+responsive_design = true;
+$(".left_column").append($("<div>").attr("class","responsive_left").append($(".right_column").children()));
+$(".right_column").remove();
+}
+else {
+responsive_design = false;
+}
 if (Notification.permission === 'default') {
 Notification.requestPermission(function(p) {
 if (p === 'denied') {
@@ -397,3 +419,17 @@ var ctx = document.createElement("canvas").getContext("2d");
 ctx.fillText("😗",-2,4);
 return ctx.getImageData(0,0,1,1).data[3] > 0;
 }
+function openStatus(link) {
+api.get("search?q="+link,function(response) {
+if(response.statuses.length > 0) {
+var data = response.statuses[0];
+if(data.account.acct.indexOf("@") == -1) {
+data.account.acct = data.account.acct+"@"+current_instance;
+}
+window.location.href = "/@"+data.account.acct+"/status/"+data.id+"&mid="+data.account.id;
+}
+else {
+window.location.href = "/404";
+}
+});
+}

assets/js/halcyon/halcyonSettings.js

@@ -58,7 +58,7 @@ $this.addClass('s-hidden');
 $this.wrap('<div class="select"></div>');
 $this.after('<div class="halcyon_button styledselect"></div>');
 var $styledSelect = $this.next('div.styledselect');
-var $selectText = $("<span>").css("margin","auto").text($this.children('option[selected]').eq(0).text()+" ⏷");
+var $selectText = $("<span>").css("margin","auto").text($this.children('option[selected]').eq(0).text()+" ⏷");
 $styledSelect.append($selectText);
 var $list = $('<ul/>',{'class':'options'}).insertAfter($styledSelect);
 for(var i=0;i<numberOfOptions;i++) {
@@ -77,7 +77,7 @@ $(this).addClass('active').next('ul.options').slideDown();
 });
 $listItems.click(function(e) {
 e.stopPropagation();
-$selectText.text($(this).text()+" ⏷");
+$selectText.text($(this).text()+" ⏷");
 $this.val($(this).attr('rel'));
 $this.change();
 $list.slideUp(function() {$styledSelect.removeClass('active')});
@@ -196,6 +196,18 @@ $(document).on('change',".post_streaming_wrap input[name='post_streaming']:check
 localStorage.setItem("setting_post_stream", $(this).val());
 putMessage(__("Changed setting to")+" "+$(this).val());
 });
+$("#setting_dark_theme").change(function() {
+if(this.checked) {
+$.cookie("darktheme","true",{path:'/',expires:3650});
+$(document.body).append($("<link>").attr("rel","stylesheet").attr("href","/assets/css/dark.css"));
+putMessage(__("Dark theme enabled"));
+}
+else {
+$.cookie("darktheme","false",{path:'/',expires:3650});
+$("link[href='/assets/css/dark.css']").remove();
+putMessage(__("Dark theme disabled"));
+}
+});
 $("#setting_link_previews").change(function() {
 if(this.checked) {
 localStorage.setItem("setting_link_previews","true");

assets/js/halcyon/halcyonUI.js

@@ -1,3 +1,15 @@
+$(window).resize(function() {
+if($(window).width() < 1200 && responsive_design == false) {
+responsive_design = true;
+$(".left_column").append($("<div>").attr("class","responsive_left").append($(".right_column").children()));
+$(".right_column").remove();
+}
+else if($(window).width() >= 1200 && responsive_design == true) {
+responsive_design = false;
+$(".article_wrap").append($("<div>").attr("class","right_column").append($(".responsive_left").children()));
+$(".responsive_left").remove();
+}
+});
 $(function() {
 $('input[type="file"]').val('');
 });
@@ -255,8 +267,8 @@ let statuses = [];
 const original_title = $('title').text();
 if(streamscope) {
 api.stream(streamscope, function(userstream) {
-if(userstream.event === "update") {
 const streaming_option = localStorage.getItem("setting_post_stream");
+if(userstream.event === "update") {
 if(streaming_option === "manual") {
 if(!$('.toot_entry[sid="'+userstream.payload.id+'"]').length) {
 if(!(show_replies == "false" && userstream.payload.in_reply_to_id)) {
@@ -265,9 +277,6 @@ statuses.unshift(userstream.payload);
 $('#js-stream_update > button > span').text(statuses.length);
 $('title').text("("+statuses.length+") "+original_title);
 $('#header .header_nav_list .'+scope+'_badge').removeClass('invisible');
-}
-else if(userstream.event === "delete") {
-
 }
 }
 }
@@ -290,6 +299,90 @@ replace_emoji();
 }
 }
 }
+else if(streaming_option == "ontop") {
+var scrollTop = window.pageYOffset || document.documentElement.scrollTop;
+if(scrollTop == 0) {
+if(!$('.toot_entry[sid="'+userstream.payload.id+'"]').length) {
+if(!(show_replies == "false" && userstream.payload.in_reply_to_id)) {
+timeline_template(userstream.payload).prependTo("#js-timeline");
+replaceInternalLink();
+replace_emoji();
+if(level === "timelines/home" | level === "timelines/public") {
+if(userstream.payload.in_reply_to_id & !$(".toot_entry[sid='"+userstream.in_reply_to_id+"']").length) {
+let reply_source = userstream.payload.id;
+api.get('statuses/'+userstream.payload.in_reply_to_id, function(in_reply_statuses) {
+$("#js-timeline .toot_entry[sid='"+reply_source+"']").before(context_template(in_reply_statuses, 'ancestors_status default_padding'));
+replaceInternalLink();
+replace_emoji();
+});
+}
+}
+}
+}
+}
+else {
+if(!$('.toot_entry[sid="'+userstream.payload.id+'"]').length) {
+if(!(show_replies == "false" && userstream.payload.in_reply_to_id)) {
+statuses.unshift(userstream.payload);
+$('title').text("("+statuses.length+") "+original_title);
+}
+}
+}
+}
+}
+else if(userstream.event === "delete") {
+$('.toot_entry[sid="'+userstream.payload+'"]').remove();
+if(streaming_option == "manual") {
+for(var i=0;i<statuses.length;i++) {
+if(statuses[i].id == userstream.payload) {
+statuses.splice(i,1);
+if(statuses.length == 0) {
+$('#js-stream_update').css({'display':'none','height':'0','padding':'0px'});
+$('title').text(original_title);
+}
+else {
+$('#js-stream_update > button > span').text(statuses.length);
+$('title').text("("+statuses.length+") "+original_title);
+}
+}
+}
+}
+else if(streaming_option == "ontop") {
+for(var i=0;i<statuses.length;i++) {
+if(statuses[i].id == userstream.payload) {
+statuses.splice(i,1);
+if(statuses.length == 0) {
+$('title').text(original_title);
+}
+else {
+$('title').text("("+statuses.length+") "+original_title);
+}
+}
+}
+}
+}
+});
+}
+if(localStorage.getItem("setting_post_stream") == "ontop") {
+$(document).scroll(function() {
+var scrollTop = window.pageYOffset || document.documentElement.scrollTop;
+if(scrollTop == 0) {
+statuses.reverse();
+for(let i in statuses) {
+timeline_template(statuses[i]).prependTo("#js-timeline");
+replace_emoji();
+if ( level === "timelines/home" | level === "timelines/public" ) {
+if (statuses[i].in_reply_to_id) {
+const reply_source = statuses[i].id;
+api.get('statuses/'+statuses[i].in_reply_to_id, function(in_reply_statuses) {
+$("#js-timeline .toot_entry[sid='"+reply_source+"']").before(context_template(in_reply_statuses, 'ancestors_status default_padding'));
+replace_emoji();
+});
+}
+}
+$('title').text(original_title);
+};
+statuses = [];
 }
 });
 }
@@ -956,6 +1049,7 @@ form.reset();
 $('#header_status_form').removeClass('ready');
 $('#header_status_form .status_textarea').removeClass('disallow_select');
 $('#header_status_form .character_count').html(current_instance_charlimit);
+$(document).click();
 });
 } else {
 const dummy_form = $('<form></form>').append($('#header_status_media_atta')),
@@ -984,6 +1078,7 @@ form.reset();
 $('#header_status_form').removeClass('ready');
 $('#header_status_form .status_textarea').removeClass('disallow_select');
 $('#header_status_form .character_count').html(current_instance_charlimit);
+$(document).click();
 });
 });
 break;
@@ -1010,6 +1105,7 @@ $('#reply_status_emoji').lsxEmojiPicker("destroy");
 $(document).on('click','#reply_status_form', function(e) {
 if(!$('#reply_status_form .status_textarea textarea').hasClass('focus')) {
 var mentions = JSON.parse($('#reply_status_form').attr('mentions'));
+mentions.reverse();
 var replyto = "";
 for(var i=0;i < mentions.length;i++) {
 if(mentions[i].acct != current_acct) {
@@ -1171,6 +1267,7 @@ $(document).on('click', '.reply_button', function(e) {
 e.stopPropagation();
 const sid= $(this).attr('tid'),
 mentions = JSON.parse($(this).attr('mentions'));
+mentions.reverse();
 var replyto = "";
 for(var i=0;i < mentions.length;i++) {
 if(mentions[i].acct != current_acct) {

assets/js/mastodon.js/mastodon.js

@@ -289,7 +289,9 @@ var listener = function (event) {
 console.log("Got Data from Stream " + streamType);
 if(event.data.length != 0) {
 event = JSON.parse(event.data);
+if(!Number.isInteger(JSON.parse(event.payload))) {
 event.payload = JSON.parse(event.payload);
+}
 onData(event);
 }
 };

header.php

@@ -13,6 +13,9 @@ include("language.php");
 <link rel="shortcut icon" href="/assets/images/favicon.ico">
 <link rel="gettext" type="text/x-gettext-translation" href="/locale/<?=$locale?>/LC_MESSAGES/messages.po">
 <link rel="stylesheet" href="/assets/css/style.css" media="all">
+<?php if($_COOKIE['darktheme'] == "true")
+echo '<link rel="stylesheet" href="/assets/css/dark.css" media="all">';
+?>
 <link rel="stylesheet" href="/assets/css/fontawesome.min.css" media="all">
 <link rel="stylesheet" href="/assets/css/emojipicker.css" media="all">
 <script src="/assets/js/jquery/jquery.min.js"></script>

locale/gl_ES/LC_MESSAGES/messages.po

@@ -0,0 +1,545 @@
+# Niklas Poslovski <ni.pos@yandex.com>, 2018. #zanata
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"MIME-Version: 1.0\n"
+"PO-Revision-Date: 2018-09-03 02:50+0000\n"
+"Last-Translator: Xosé M. <correo@xmgz.eu>\n"
+"Language-Team: Galician\n"
+"Language: gl\n"
+"X-Generator: Zanata 4.6.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+msgid "Language"
+msgstr "Idioma"
+
+msgid "Language_en_US"
+msgstr "English"
+
+msgid "Language_de_DE"
+msgstr "German"
+
+msgid "Language_ja_JP"
+msgstr "Japanese"
+
+msgid "Language_ko_KR"
+msgstr "Korean"
+
+msgid "Language_pt_BR"
+msgstr "Portuguese (Brazil)"
+
+msgid "Language_pl_PL"
+msgstr "Polish"
+
+msgid "Language_gl_ES"
+msgstr "Galician"
+
+msgid "Sensitive content"
+msgstr "Contido sensible"
+
+msgid "Click to view"
+msgstr "Pulse para ver"
+
+msgid "SHOW MORE"
+msgstr "MOSTRAR MÁIS"
+
+msgid "SHOW LESS"
+msgstr "MOSTRAR MENOS"
+
+msgid "Public"
+msgstr "Público"
+
+msgid "Unlisted"
+msgstr "Non listado"
+
+msgid "Followers-only"
+msgstr "Só seguidoras"
+
+msgid "Direct"
+msgstr "Directa"
+
+msgid "Delete Toot"
+msgstr "Eliminar Toot"
+
+msgid "Unpin Toot"
+msgstr "Despegar Toot"
+
+msgid "Pin Toot"
+msgstr "Fixar Toot"
+
+msgid "Mute"
+msgstr "Acalar"
+
+msgid "Block"
+msgstr "Bloquear"
+
+msgid "Report this Toot"
+msgstr "Informar sobre este Toot"
+
+msgid "Copy link to Toot"
+msgstr "Copiar ligazón ao Toot"
+
+msgid "View original"
+msgstr "Ver orixinal"
+
+msgid "Boosted"
+msgstr "Promocionado"
+
+msgid "Pinned Toot"
+msgstr "Toot fixado"
+
+msgid "favourited Your Toot"
+msgstr "favoreceu o seu Toot"
+
+msgid "boosted Your Toot"
+msgstr "promocionou o seu Toot"
+
+msgid "followed you"
+msgstr "Segueuna"
+
+msgid "Follow"
+msgstr "Seguir"
+
+msgid "Toot your reply"
+msgstr "Toot a súa resposta"
+
+msgid "Reply"
+msgstr "Resposta"
+
+msgid "Content warning"
+msgstr "Aviso de contido"
+
+msgid "Jan"
+msgstr "Xan"
+
+msgid "Feb"
+msgstr "Feb"
+
+msgid "Mar"
+msgstr "Mar"
+
+msgid "Apr"
+msgstr "Abr"
+
+msgid "May"
+msgstr "Mai"
+
+msgid "Jun"
+msgstr "Xun"
+
+msgid "Jul"
+msgstr "Xul"
+
+msgid "Aug"
+msgstr "Ago"
+
+msgid "Sep"
+msgstr "Set"
+
+msgid "Oct"
+msgstr "Out"
+
+msgid "Nov"
+msgstr "Nov"
+
+msgid "Dec"
+msgstr "Nad"
+
+msgid "Changed setting to"
+msgstr "Cambiou o axuste a"
+
+msgid "Mark as NSFW by default enabled"
+msgstr "Marcar como NSFW activado por omisión"
+
+msgid "Mark as NSFW by default disabled"
+msgstr "Marcar como NSFW desactivado por omisión"
+
+msgid "Who to follow enabled"
+msgstr "A quen seguir activado"
+
+msgid "Who to follow disabled"
+msgstr "A quen seguir desactivado"
+
+msgid "Changed about me setting"
+msgstr "O axuste Sobre min cambiou"
+
+msgid "Uploaded new avatar"
+msgstr "Novo avatar subido"
+
+msgid "Uploaded new header"
+msgstr "Nova cabeceira subida"
+
+msgid "Account locked"
+msgstr "Conta bloqueada"
+
+msgid "Account unlocked"
+msgstr "Conta desbloqueada"
+
+msgid "Link previews enabled"
+msgstr "Vista previa de ligazóns activada"
+
+msgid "Link previews disabled"
+msgstr "Vista previa de ligazóns desactivada"
+
+msgid "You didn't allow notifications"
+msgstr "Non permiteu as notificacións"
+
+msgid "Desktop notifications enabled"
+msgstr "Notificacións de escritorio activadas"
+
+msgid "Desktop notifications disabled"
+msgstr "Notificacións de escritorio desactivadas"
+
+msgid "Replies shown"
+msgstr "Respostas mostradas"
+
+msgid "Replies hidden"
+msgstr "Respostas ocultas"
+
+msgid "CW content shown"
+msgstr "Contido CW mostrado"
+
+msgid "CW content hidden"
+msgstr "Contido CW oculto"
+
+msgid "NSFW content shown"
+msgstr "Contido NSFW mostrado"
+
+msgid "NSFW content hidden"
+msgstr "Contido NSFW oculto"
+
+msgid "Reply to"
+msgstr "Respostar a"
+
+msgid "Report"
+msgstr "Informar"
+
+msgid "Report a Toot of"
+msgstr "Informar sobre un Toot de"
+
+msgid "What's happening?"
+msgstr "Qué acontece?"
+
+msgid "Toot"
+msgstr "Toot"
+
+msgid "Compose new Toot"
+msgstr "Escribir un novo Toot"
+
+msgid "Please describe what the problem with the Toot is."
+msgstr "Por favor, describa cal é o problema co Toot."
+
+msgid "TOOTS"
+msgstr "TOOTS"
+
+msgid "PEOPLE"
+msgstr "XENTE"
+
+msgid "Settings"
+msgstr "Axustes"
+
+msgid "GENERAL"
+msgstr "XERAL"
+
+msgid "PROFILE"
+msgstr "PERFIL"
+
+msgid "APPEARANCE"
+msgstr "ASPECTO"
+
+msgid "Change instance"
+msgstr "Cambiar de instancia"
+
+msgid "Blank for default"
+msgstr "Baldeiro por omisión"
+
+msgid "FOLLOWING"
+msgstr "SEGUINDO"
+
+msgid "Interesting accounts of devs"
+msgstr "Contas de devs interesantes"
+
+msgid "Halcyon for"
+msgstr "Halcyon para"
+
+msgid "About"
+msgstr "Acerca de"
+
+msgid "Terms"
+msgstr "Termos"
+
+msgid "Apps"
+msgstr "Apps"
+
+msgid "Source code"
+msgstr "Código fonte"
+
+msgid "Other instances"
+msgstr "Outras instancias"
+
+msgid "Privacy policy"
+msgstr "Política de intimidade"
+
+msgid "Version"
+msgstr "Versión"
+
+msgid "Who to follow"
+msgstr "A quen seguir"
+
+msgid "Enable who to follow"
+msgstr "Activar a quen seguir"
+
+msgid ""
+"Halcyon needs to connect to an external server to get a list of users which "
+"have similar interests as you. If you want to use this feature, please opt-"
+"in."
+msgstr ""
+"Halcyon precisa conectar con un servidor externo para obter un listado de "
+"usuarias que teñen intereses semellantes aos seus. Se quere utilizar esta "
+"característica, por favor indique a preferencia."
+
+msgid "MORE"
+msgstr "MÁIS"
+
+msgid "FOLLOWERS"
+msgstr "SEGUIDORAS"
+
+msgid "Following"
+msgstr "Seguindo"
+
+msgid "You'll no longer receive notifications from this user"
+msgstr "Non recibirá notificacións de esta usuaria"
+
+msgid "Unmuted this user"
+msgstr "Devolveulle a voz a esta usuaria"
+
+msgid "This user has been blocked"
+msgstr "Esta usuaria foi bloqueada"
+
+msgid "Unblocked this user"
+msgstr "Desbloqueou esta usuaria"
+
+msgid "Your Toot has been deleted"
+msgstr "O seu toot foi eliminado"
+
+msgid "Your Toot has been pinned"
+msgstr "O seu toot foi fixado"
+
+msgid "Your Toot has been unpinned"
+msgstr "O seu toot foi despegado"
+
+msgid "Edit profile"
+msgstr "Editar perfil"
+
+msgid "FAVOURITES"
+msgstr "FAVORITAS"
+
+msgid "Show"
+msgstr "Mostrar"
+
+msgid "Blocking"
+msgstr "Bloqueando"
+
+msgid "Muting"
+msgstr "Acalando"
+
+msgid "Requested"
+msgstr "Solicitado"
+
+msgid "Photos and toots"
+msgstr "Fotos e toots"
+
+msgid "favourited your toot"
+msgstr "favoreceron o seu toot"
+
+msgid "boosted your toot"
+msgstr "promocionaron o seu toot"
+
+msgid "mentioned you"
+msgstr "mencionárona"
+
+msgid "Your Toot was posted!"
+msgstr "O seu toot foi publicado!"
+
+msgid "News"
+msgstr "Novas"
+
+msgid "Source"
+msgstr "Fonte"
+
+msgid "Privacy"
+msgstr "Intimidade"
+
+msgid "Imprint"
+msgstr "Impresum"
+
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "Login"
+msgstr "Conectar"
+
+msgid "Login to Halcyon"
+msgstr "Conectar a Halcyon"
+
+msgid "create an account"
+msgstr "crear unha conta"
+
+msgid "or"
+msgstr "ou"
+
+msgid "I agree with the"
+msgstr "Acepto as"
+
+msgid "What is Halcyon"
+msgstr "Que é Halcyon"
+
+msgid ""
+"which aims to recreate the simple and beautiful user interface of Twitter "
+"while keeping all advantages of decentral networks in focus."
+msgstr ""
+"que pretende recrear a interface simple e bela de Twitter mentras mantén "
+"todas as vantaxes das redes descentralizadas."
+
+msgid "Halcyon is a webclient for"
+msgstr "Halcyon é un cliente web para"
+
+msgid "Contact / Feedback"
+msgstr "Contacto / Informe"
+
+msgid "Use my contact form"
+msgstr "Utilice o meu formulario de contacto"
+
+msgid "Help us"
+msgstr "Axúdenos"
+
+msgid "Halcyon Terms of Use"
+msgstr "Termos de Uso de Halcyon"
+
+msgid ""
+"This terms of use agreement is for the users of web service Halcyon for "
+"Mastodon and Pleroma (Halcyon for short) hosted at"
+msgstr ""
+"Este acordo de termos de uso é para as usuarias do servizo web Halcyon para "
+"Mastodon e Pleroma (resumido Halcyon) aloxado en"
+
+msgid "Your Reply was posted!"
+msgstr "A súa Resposta foi publicada!"
+
+msgid "Toot reported successfully!"
+msgstr "Informou sobre o Toot correctamente!"
+
+msgid "Link successfully copied!"
+msgstr "Ligazón copiada correctamente!"
+
+msgid "Home"
+msgstr "Inicio"
+
+msgid "Local"
+msgstr "Local"
+
+msgid "Federated"
+msgstr "Federada"
+
+msgid "Notifications"
+msgstr "Notificacións"
+
+msgid "Search Mastodon"
+msgstr "Buscar en Mastodon"
+
+msgid "View profile"
+msgstr "Ver perfil"
+
+msgid "Log out"
+msgstr "Desconectar"
+
+msgid "All"
+msgstr "Todo"
+
+msgid "new notitification"
+msgstr "nova notificación"
+
+msgid "Show all NSFW content"
+msgstr "Mostrar todo o contido NSFW"
+
+msgid "Show all CW content"
+msgstr "Mostrar todo o contido CW"
+
+msgid "Show replies"
+msgstr "Mostrar respostas"
+
+msgid "Desktop notifications"
+msgstr "Notificacións de escritorio"
+
+msgid "Enable link previews"
+msgstr "Activar vista previa de ligazóns"
+
+msgid "Auto update"
+msgstr "Actualización automática"
+
+msgid "Manual update"
+msgstr "Actualización manual"
+
+msgid "Appearance settings"
+msgstr "Axustes do aspecto"
+
+msgid "New posts streaming"
+msgstr "Fluxo de novas publicacións"
+
+msgid "replies"
+msgstr "respostas"
+
+msgid "General settings"
+msgstr "Axustes xeráis"
+
+msgid "Default post privacy"
+msgstr "Intimidade por omisión das publicacións"
+
+msgid "Mark as NSFW by default"
+msgstr "Marcar como NSFW por omisión"
+
+msgid "Media"
+msgstr "Medios"
+
+msgid "FOLLOWS YOU"
+msgstr "SÉGUENA"
+
+msgid "Local instance"
+msgstr "Instancia local"
+
+msgid "Hashtag search filter"
+msgstr "Filtro de busca de etiquetas"
+
+msgid "All instances"
+msgstr "Todas as instancias"
+
+msgid "Local only"
+msgstr "Só local"
+
+msgid "Lock account"
+msgstr "Bloquear conta"
+
+msgid "Header"
+msgstr "Cabeceira"
+
+msgid "Avatar"
+msgstr "Avatar"
+
+msgid "About me"
+msgstr "Sobre min"
+
+msgid "Display name"
+msgstr "Mostrar nome"
+
+msgid "Profile settings"
+msgstr "Axustes do perfil"
+
+msgid "Toots"
+msgstr "Toots"
+
+msgid "Favourites"
+msgstr "Favoritas"
+

login/auth.php

@@ -10,6 +10,9 @@ localStorage.getItem('current_authtoken')
 location.href = '/logout';
 };
 </script>
+<script src="/assets/js/jquery/jquery.min.js"></script>
+<script src="/assets/js/mastodon.js/mastodon.js"></script>
+<script src="/assets/js/jquery-cookie/src/jquery.cookie.js"></script>
 <?php
 require_once('../authorize/mastodon.php');
 use HalcyonSuite\HalcyonForMastodon\Mastodon;
@@ -40,14 +43,13 @@ localStorage.setItem('setting_show_content_warning', 'false');
 localStorage.setItem('setting_show_nsfw', 'false');
 localStorage.setItem('setting_post_privacy','".$profile["source"]["privacy"]."');
 localStorage.setItem('setting_post_sensitive','".$profile["source"]["sensitive"]."');
+$.cookie('darktheme','false',{path:'/',expires:3650});
 location.href = '/';
 </script>
 ";
 }
 }
 ?>
-<script src="/assets/js/jquery/jquery.min.js"></script>
-<script src="/assets/js/mastodon.js/mastodon.js"></script>
 </head>
 <body>
 </body>

settings_appearance.php

@@ -25,6 +25,21 @@
 <input id="streaming-2" name="post_streaming" type="radio" value="manual">
 <label for="streaming-2" class="radiotext"><?=_('Manual update')?></label>
 </div>
+<div class="radiobox">
+<input id="streaming-3" name="post_streaming" type="radio" value="ontop">
+<label for="streaming-3" class="radiotext"><?=_('Only on top')?></label>
+</div>
+</div>
+<div style="float:left;width:50%;text-align:right;margin-top:16px">
+<h3><?=_('Enable dark theme')?></h3>
+</div>
+<div class="dark_theme_wrap" style="float:left;width:50%">
+<div class="switch">
+<input type="checkbox" id="setting_dark_theme" <?php if($_COOKIE['darktheme'] == "true") echo "checked='checked'" ?>>
+<div class="switch-btn">
+<span></span>
+</div>
+</div>
 </div>
 <div style="float:left;width:50%;text-align:right;margin-top:16px">
 <h3><?=_('Enable link previews')?></h3>

version.txt

@@ -1 +1 @@
-2.0.1
+2.0.2