From db7afd4430fa6028bde21fc98d4862ee0db1ca61 Mon Sep 17 00:00:00 2001 From: nipos Date: Sun, 14 Oct 2018 15:37:55 +0200 Subject: [PATCH] Improved German translation,added toot to @username buttons to profiles,removed blocked and muted people from who to follow --- README.md | 1 + assets/js/halcyon/halcyonFunctions.js | 39 +++++++- assets/js/halcyon/halcyonLists.js | 44 ++++----- assets/js/halcyon/halcyonSettings.js | 41 +++++++++ assets/js/halcyon/halcyonTemplates.js | 68 +++++++++++--- assets/js/halcyon/halcyonUI.js | 48 ++++++++-- assets/js/halcyon/halcyonWorker.js | 28 ++++++ locale/de_DE/LC_MESSAGES/messages.mo | Bin 9333 -> 11673 bytes locale/de_DE/LC_MESSAGES/messages.po | 126 +++++++++++++++++++++++-- locale/en_US/LC_MESSAGES/messages.mo | Bin 8764 -> 10985 bytes locale/en_US/LC_MESSAGES/messages.po | 128 ++++++++++++++++++++++++-- login/auth.php | 1 + login/login.php | 1 + settings_appearance.php | 13 +++ user.php | 6 ++ user_followers.php | 4 + user_following.php | 4 + user_include_replies.php | 4 + user_only_media.php | 4 + version.txt | 2 +- 20 files changed, 498 insertions(+), 64 deletions(-) create mode 100644 assets/js/halcyon/halcyonWorker.js diff --git a/README.md b/README.md index 52d5121..97102eb 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ We moved our instances list to a wiki page: https://notabug.org/halcyon-suite/ha Read our new wiki pages: https://notabug.org/halcyon-suite/halcyon/wiki ## Blog +- Release of Version 2.1.2 - Added toot to @someone button to profiles,remove blocked and muted people from who to follow,improved German translation - Release of Version 2.1.1 - Profile settings can be changed again,fixed various Firefox-only bugs,Removed error if browser sends no language - [Release of Version 2.1.0 - Introducing lists and more](https://nikisoft.myblog.de/nikisoft/art/11640527/Halcyon-2-1-0-Introducing-lists-and-more) - 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 diff --git a/assets/js/halcyon/halcyonFunctions.js b/assets/js/halcyon/halcyonFunctions.js index 9f2bd5e..5e9dabc 100644 --- a/assets/js/halcyon/halcyonFunctions.js +++ b/assets/js/halcyon/halcyonFunctions.js @@ -205,6 +205,7 @@ localStorage.setItem("current_acct",AccountObj["acct"]); localStorage.setItem("current_url",getRelativeURL(AccountObj["url"],AccountObj["id"])); localStorage.setItem("current_header",AccountObj["header"]); localStorage.setItem("current_avatar",AccountObj["avatar"]); +localStorage.setItem("current_locked",AccountObj["locked"]); localStorage.setItem("current_statuses_count",AccountObj["statuses_count"]); localStorage.setItem("current_following_count",AccountObj["following_count"]); localStorage.setItem("current_followers_count",AccountObj["followers_count"]); @@ -218,6 +219,7 @@ current_acct = localStorage.getItem("current_acct"); current_url = localStorage.getItem("current_url"); current_header = localStorage.getItem("current_header"); current_avatar = localStorage.getItem("current_avatar"); +current_locked = localStorage.getItem("current_locked"); current_statuses_count = localStorage.getItem("current_statuses_count"); current_following_count = localStorage.getItem("current_following_count"); current_followers_count = localStorage.getItem("current_followers_count"); @@ -228,8 +230,8 @@ current_favourites_link = localStorage.getItem("current_favourites_link"); setCurrentProfile(); }); api.get("accounts/"+current_id+"/following",function(data) { -followings = new Array(); -for(i=0;i").attr("list-id",lists[i].id).addClass("timeline_header").css("margin-bottom","10px").append( $("
").addClass("header_items").append( $("").attr("href","/lists/"+lists[i].id).addClass("list-title").addClass("item").addClass("emoji_poss").text(lists[i].title)).append( -$("").attr("href","/lists/"+lists[i].id+"/add").addClass("list-adduser").addClass("item").css("float","right").append( -$("").addClass("fa").addClass("fa-user-plus") -)).append( +$("").attr("href","javascript:void(0)").addClass("list-delete").addClass("item").css("float","right").append( +$("").addClass("fa").addClass("fa-trash") +).click(function() { +const list_id = $(this).parent().parent().attr("list-id"); +$("#js-overlay_content_wrap .temporary_object").empty(); +$('#js-overlay_content_wrap').addClass('view'); +$('#js-overlay_content_wrap').addClass('black_08'); +$('.overlay_confirm').removeClass('invisible'); +$('.overlay_confirm_text').text(__("Are you sure that you want to delete this list?")); +$('.overlay_confirm_yes').click(function() { +$('.close_button').click(); +api.delete("lists/"+list_id,function(data) { +$('.header_nav_item[list-id="'+list_id+'"]').remove(); +$('.timeline_header[list-id="'+list_id+'"]').remove(); +$('#js-follows_profile[list-id="'+list_id+'"]').remove(); +putMessage(__("Your list has been deleted")); +}); +}); +})).append( $("").attr("href","javascript:void(0)").addClass("list-edit").addClass("item").css("float","right").append( $("").addClass("fa").addClass("fa-pencil") ).click(function() { @@ -51,25 +67,9 @@ replace_emoji(); } }); })).append( -$("").attr("href","javascript:void(0)").addClass("list-delete").addClass("item").css("float","right").append( -$("").addClass("fa").addClass("fa-trash") -).click(function() { -const list_id = $(this).parent().parent().attr("list-id"); -$("#js-overlay_content_wrap .temporary_object").empty(); -$('#js-overlay_content_wrap').addClass('view'); -$('#js-overlay_content_wrap').addClass('black_08'); -$('.overlay_confirm').removeClass('invisible'); -$('.overlay_confirm_text').text(__("Are you sure that you want to delete this list?")); -$('.overlay_confirm_yes').click(function() { -$('.close_button').click(); -api.delete("lists/"+list_id,function(data) { -$('.header_nav_item[list-id="'+list_id+'"]').remove(); -$('.timeline_header[list-id="'+list_id+'"]').remove(); -$('#js-follows_profile[list-id="'+list_id+'"]').remove(); -putMessage(__("Your list has been deleted")); -}); -}); -})))).append( +$("").attr("href","/lists/"+lists[i].id+"/add").addClass("list-adduser").addClass("item").css("float","right").append( +$("").addClass("fa").addClass("fa-user-plus") +)))).append( $("