mirrors
/
halcyon
mirror of https://notabug.org/halcyon-suite/halcyon.git
1
0
Fork 0
Code Releases Activity

Add Dutch translation,allow adding more toots to editor,many bugfixes

This commit is contained in:
nipos 2019-05-07 19:19:29 +02:00
parent 63f260dc16
commit b2dd506688
17 changed files with 1373 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -27,6 +27,7 @@ We moved our instances list to our webpage: https://www.halcyon.social/instances
or read our new documentation pages to install it manually: https://www.halcyon.social/documentation.php?page=install or read our new documentation pages to install it manually: https://www.halcyon.social/documentation.php?page=install
## Blog ## Blog
- Release of Version 2.3.1 - Fix duplicated thread,allow adding more toots as reply chain,add Dutch translation,more bugfixes,improved translations.
- [Zanata outage and our reactions](https://nikisoft.myblog.de/nikisoft/art/11671991/Zanata-outage-and-our-reactions) - [Zanata outage and our reactions](https://nikisoft.myblog.de/nikisoft/art/11671991/Zanata-outage-and-our-reactions)
- [Release of Version 2.3.0 - Polls are coming to Mastodon](https://nikisoft.myblog.de/nikisoft/art/11669027/Halcyon-2-3-0-Polls-are-coming-to-Mastodon) - [Release of Version 2.3.0 - Polls are coming to Mastodon](https://nikisoft.myblog.de/nikisoft/art/11669027/Halcyon-2-3-0-Polls-are-coming-to-Mastodon)
- Release of Version 2.2.5 - Add French translation,improve German translation,add support for video captions,add support for video thumbnails - Release of Version 2.2.5 - Add French translation,improve German translation,add support for video captions,add support for video thumbnails

3
assets/css/dark.css
View File

@ -38,6 +38,9 @@ background-color:#132030;
background-color: #132030; background-color: #132030;
color:#fff; color:#fff;
} }
.status_form .status_textarea textarea:not(:last-of-type) {
border-bottom:1px solid #000;
}
.status_form .status_textarea .media_attachments_preview_area, .status_form .status_textarea .media_attachments_preview_area,
.status_form .status_textarea .status_poll_editor { .status_form .status_textarea .status_poll_editor {
background-color:#1B2836; background-color:#1B2836;

34
assets/css/style.css
View File

@ -139,17 +139,17 @@ cursor: default;
.status_form .status_top { .status_form .status_top {
display: flex; display: flex;
align-items: center; align-items: center;
width: calc( 100% - 54px );
padding-bottom: 0; padding-bottom: 0;
margin-left: 54px;
box-sizing: border-box; box-sizing: border-box;
} }
.status_form .status_top .status_spoiler { .status_form .status_top .status_spoiler {
color: #189EFC; color: #000;
width: 100%; width: 100%;
height: 35px; height: 35px;
border-radius: 4px; border-top-left-radius:4px;
border-top-right-radius:4px;
border: 1px solid #C7E7FB; border: 1px solid #C7E7FB;
border-bottom:0 !important;
font-size: 14px; font-size: 14px;
padding: 8px; padding: 8px;
box-sizing: border-box; box-sizing: border-box;
@ -157,8 +157,9 @@ box-sizing: border-box;
.status_form .status_main { .status_form .status_main {
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
width:100%;
} }
.status_form .status_main .icon_box { #autoCompleteDropDown .icon_box {
flex-shrink: 0; flex-shrink: 0;
margin-right: 8px; margin-right: 8px;
width: 32px; width: 32px;
@ -167,14 +168,32 @@ border-radius: 5px;
overflow: hidden; overflow: hidden;
margin-left: 14px; margin-left: 14px;
} }
#header_status_form .status_main,#reply_status_form .status_main,#header_status_form .status_top,#reply_status_form .status_top {
width: calc( 100% - 54px );
margin-left: 54px;
}
.status_form .status_left.icon_box {
flex-shrink: 0;
margin-right: 8px;
width: 32px;
height: 32px;
border-radius: 5px;
overflow: hidden;
margin-left: 14px;
float:left
}
.status_form .status_main .status_textarea { .status_form .status_main .status_textarea {
flex: 1; flex: 1;
padding: 8px; padding: 8px;
border-radius: 3px; border-radius:3px;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #C7E7FB; border: 1px solid #C7E7FB;
background-color: #fff; background-color: #fff;
} }
.status_form .status_main .status_textarea.status_has_cw {
border-top-left-radius:0;
border-top-right-radius:0;
}
.status_form .status_main .status_textarea textarea { .status_form .status_main .status_textarea textarea {
color: #000; color: #000;
resize: none; resize: none;
@ -187,6 +206,9 @@ line-height: normal;
outline: 0; outline: 0;
overflow: hidden; overflow: hidden;
} }
.status_form .status_textarea textarea:not(:last-of-type) {
border-bottom:1px solid #C7E7FB;
}
.status_form .status_textarea textarea.focus { .status_form .status_textarea textarea.focus {
height: 68px; height: 68px;
} }

27
assets/js/halcyon/halcyonFunctions.js
View File

@ -566,3 +566,30 @@ media_views += "</div>";
if($(media_views).children().length != 0) element.append(media_views); if($(media_views).children().length != 0) element.append(media_views);
} }
} }
function enableAutoComplete(textarea) {
if(localStorage.setting_compose_autocomplete == "true") {
textarea.autoCompleteToken({instance:1,startkey:"@",endkey:" ",arrayname:"accounts",resultname:"acct"});
textarea.autoCompleteToken({instance:2,startkey:"#",endkey:" ",arrayname:"hashtags"});
textarea.autoCompleteToken({instance:3,startkey:":",endkey:";",source:actEmojiData,resultname:"name",callback:function() {
textarea.trigger({"type":"keyup","key":":"});
}});
}
}
function submitStatusArray(params,callback) {
var statuses = params.status;
params.status = params.status.first().val();
api.post("statuses",params,function(data) {
statuses = statuses.filter(function(index) {return index != 0});
if(statuses.length == 0) {
callback();
}
else {
var nparams = new Object();
nparams.status = statuses;
nparams.visibility = params.visibility;
nparams.spoiler_text = params.spoiler_text;
nparams.in_reply_to_id = data.id;
submitStatusArray(nparams,callback);
}
});
}

36
assets/js/halcyon/halcyonTemplates.js
View File

@ -378,7 +378,7 @@ var account_state_icons = "";
if(status.reblog.account.locked == true) account_state_icons += " <i class='fa fa-lock'></i>"; if(status.reblog.account.locked == true) account_state_icons += " <i class='fa fa-lock'></i>";
if(status.reblog.account.bot == true) account_state_icons += " <img src='/assets/images/robot.svg' class='emoji'>"; if(status.reblog.account.bot == true) account_state_icons += " <img src='/assets/images/robot.svg' class='emoji'>";
const html = $(` const html = $(`
<li sid="${status.id}" class="toot_entry"> <li sid="${status.reblog.id}" class="toot_entry">
<div class="boost_author_box"> <div class="boost_author_box">
<a href="${status_account_link}"> <a href="${status_account_link}">
<span class="emoji_poss"><i class="fa fa-fw fa-retweet"></i>${status.account.display_name} ${__('Boosted')}</span> <span class="emoji_poss"><i class="fa fa-fw fa-retweet"></i>${status.account.display_name} ${__('Boosted')}</span>
@ -1056,7 +1056,7 @@ html.find(".toot_article").append(poll_object);
return html return html
} else if(NotificationObj.type === 'follow') { } else if(NotificationObj.type === 'follow') {
const html=(` const html=(`
<li sid="${NotificationObj.id}" class="notice_entry fol"> <li sid="${NotificationObj.id}" class="notice_entry fol toot_entry">
<div class="notice_author_box"> <div class="notice_author_box">
<a href="${notice_author_link}"> <a href="${notice_author_link}">
<div class="icon_box"> <div class="icon_box">
@ -1277,17 +1277,16 @@ ${toot_reblog_button}
</div> </div>
</div> </div>
<form id="reply_status_form" name="reply_status_form" class="status_form" sid="${status.id}" mentions='${JSON.stringify(status.mentions)}'> <form id="reply_status_form" name="reply_status_form" class="status_form" sid="${status.id}" mentions='${JSON.stringify(status.mentions)}'>
<div class="status_left icon_box">
<img class="js_current_profile_image" src="${current_avatar}">
</div>
<div class="status_top"> <div class="status_top">
<input class="status_spoiler invisible" name="status_spoiler" placeholder="${__('Content warning')}" type="text"/> <input class="status_spoiler invisible" name="status_spoiler" placeholder="${__('Content warning')}" data-random="${Math.round(Math.random()*1000)}" type="text"/>
</div> </div>
<div class="status_main"> <div class="status_main">
<!-- current avatar -->
<div class="icon_box">
<img class="js_current_profile_image" src="${current_avatar}" />
</div>
<!-- text area --> <!-- text area -->
<div class="status_textarea"> <div class="status_textarea">
<textarea class="emoji_poss" name="status_textarea" placeholder="${__('Toot your reply')}"></textarea> <textarea class="emoji_poss" name="status_textarea" placeholder="${__('Toot your reply')}" data-random="${Math.round(Math.random()*1000)}"></textarea>
<div class="media_attachments_preview_area invisible"></div> <div class="media_attachments_preview_area invisible"></div>
<div class="status_poll_editor invisible"> <div class="status_poll_editor invisible">
<i class="fa fa-circle-o"></i> <input name="options[]" type="text" class="disallow_enter textfield poll_field" maxlength="25"><br/> <i class="fa fa-circle-o"></i> <input name="options[]" type="text" class="disallow_enter textfield poll_field" maxlength="25"><br/>
@ -1359,7 +1358,9 @@ ${__("Multiple choice")}
<span class="character_count"> <span class="character_count">
${current_instance_charlimit} ${current_instance_charlimit}
</span> </span>
<!-- Submit --> <label for="header_status_addfield" class="status_addfield status_option_button">
<i class="fa fa-plus-circle" aria-hidden="true"></i>
</label>
<label for="reply_status_form_submit" class="submit_status_label"> <label for="reply_status_form_submit" class="submit_status_label">
<div class="toot_button_label disallow_select"> <div class="toot_button_label disallow_select">
<i class="fa fa-reply" aria-hidden="true"></i> <i class="fa fa-reply" aria-hidden="true"></i>
@ -1530,17 +1531,16 @@ ${status.reblog.content}
</div> </div>
</div> </div>
<form id="reply_status_form" name="reply_status_form" class="status_form" sid="${status.reblog.id}" mentions='${JSON.stringify(status.reblog.mentions)}'> <form id="reply_status_form" name="reply_status_form" class="status_form" sid="${status.reblog.id}" mentions='${JSON.stringify(status.reblog.mentions)}'>
<div class="status_left icon_box">
<img class="js_current_profile_image" src="${current_avatar}">
</div>
<div class="status_top"> <div class="status_top">
<input class="status_spoiler invisible" name="status_spoiler" placeholder="${__('Content warning')}" type="text"/> <input class="status_spoiler invisible" name="status_spoiler" placeholder="${__('Content warning')}" data-random="${Math.round(Math.random()*1000)}" type="text"/>
</div> </div>
<div class="status_main"> <div class="status_main">
<!-- current avatar -->
<div class="icon_box">
<img class="js_current_profile_image" src="${current_avatar}" />
</div>
<!-- text area --> <!-- text area -->
<div class="status_textarea"> <div class="status_textarea">
<textarea class="emoji_poss" name="status_textarea" placeholder="${__('Toot your reply')}"></textarea> <textarea class="emoji_poss" name="status_textarea" placeholder="${__('Toot your reply')}" data-random="${Math.round(Math.random()*1000)}"></textarea>
<div class="media_attachments_preview_area invisible"></div> <div class="media_attachments_preview_area invisible"></div>
<div class="status_poll_editor invisible"> <div class="status_poll_editor invisible">
<i class="fa fa-circle-o"></i> <input name="options[]" type="text" class="disallow_enter textfield poll_field" maxlength="25"><br/> <i class="fa fa-circle-o"></i> <input name="options[]" type="text" class="disallow_enter textfield poll_field" maxlength="25"><br/>
@ -1612,7 +1612,9 @@ ${__("Multiple choice")}
<span class="character_count"> <span class="character_count">
${current_instance_charlimit} ${current_instance_charlimit}
</span> </span>
<!-- Submit --> <label for="header_status_addfield" class="status_addfield status_option_button">
<i class="fa fa-plus-circle" aria-hidden="true"></i>
</label>
<label for="reply_status_form_submit" class="submit_status_label"> <label for="reply_status_form_submit" class="submit_status_label">
<div class="toot_button_label disallow_select"> <div class="toot_button_label disallow_select">
<i class="fa fa-reply" aria-hidden="true"></i> <i class="fa fa-reply" aria-hidden="true"></i>
@ -1912,7 +1914,7 @@ var account_state_icons = "";
if(status.reblog.account.locked == true) account_state_icons += " <i class='fa fa-lock'></i>"; if(status.reblog.account.locked == true) account_state_icons += " <i class='fa fa-lock'></i>";
if(status.reblog.account.bot == true) account_state_icons += " <img src='/assets/images/robot.svg' class='emoji'>"; if(status.reblog.account.bot == true) account_state_icons += " <img src='/assets/images/robot.svg' class='emoji'>";
const html=$(` const html=$(`
<div sid="${status.id}" class="toot_entry ${class_options}"> <div sid="${status.reblog.id}" class="toot_entry ${class_options}">
<div class="boost_author_box"> <div class="boost_author_box">
<a href="${status_account_link}"> <a href="${status_account_link}">
<span class="emoji_poss"><i class="fa fa-fw fa-retweet"></i>${status.account.display_name} ${__('Boosted')}</span> <span class="emoji_poss"><i class="fa fa-fw fa-retweet"></i>${status.account.display_name} ${__('Boosted')}</span>

227
assets/js/halcyon/halcyonUI.js
View File

@ -356,7 +356,7 @@ if(statuses[i].content.match(new RegExp("[^a-zA-Z1-9]"+current_filters[a].phrase
} }
} }
} }
if(filterstatus == false && timeline_hide_status.indexOf(statuses[i]) == -1 && !(show_replies == "false" && statuses[i].in_reply_to_id) && !(localStorage.setting_show_bots == "false" && statuses[i].account.bot == true && !level.match(/accounts\/\d+\/statuses/)) && !(statuses[i].visibility == "direct" && level == "timelines/home")) { if(filterstatus == false && timeline_hide_status.indexOf(statuses[i].id) == -1 && !(show_replies == "false" && statuses[i].in_reply_to_id) && !(localStorage.setting_show_bots == "false" && statuses[i].account.bot == true && !level.match(/accounts\/\d+\/statuses/)) && !(statuses[i].visibility == "direct" && level == "timelines/home")) {
timeline_template(statuses[i]).appendTo("#js-timeline"); timeline_template(statuses[i]).appendTo("#js-timeline");
if(statuses[i].in_reply_to_id && level === "timelines/home" | level === "timelines/public") { if(statuses[i].in_reply_to_id && level === "timelines/home" | level === "timelines/public") {
if(localStorage.setting_thread_view == "true") { if(localStorage.setting_thread_view == "true") {
@ -1259,6 +1259,8 @@ $(function() {
$(document).on('click', function(e) { $(document).on('click', function(e) {
if(!$(e.target).closest('#creat_status').length && !$(e.target).closest('.overlay_status').length) { if(!$(e.target).closest('#creat_status').length && !$(e.target).closest('.overlay_status').length) {
$('#overlay_status_emoji').lsxEmojiPicker("destroy"); $('#overlay_status_emoji').lsxEmojiPicker("destroy");
$('#overlay_status_form .status_top .status_spoiler').autoCompleteToken("destroy");
$('#overlay_status_form .status_textarea textarea').autoCompleteToken("destroy");
} }
}); });
$('label[for=overlay_status_emoji]').click(function(e) {$('#overlay_status_emoji').trigger('click',e)}); $('label[for=overlay_status_emoji]').click(function(e) {$('#overlay_status_emoji').trigger('click',e)});
@ -1279,13 +1281,8 @@ $('#overlay_status_form .status_textarea textarea').addClass('focus');
$('.overlay_status .submit_status_label').addClass('active_submit_button'); $('.overlay_status .submit_status_label').addClass('active_submit_button');
$('#overlay_status_form .status_textarea textarea').focus(); $('#overlay_status_form .status_textarea textarea').focus();
autosize($('#overlay_status_form .status_textarea textarea')); autosize($('#overlay_status_form .status_textarea textarea'));
if(localStorage.setting_compose_autocomplete == "true") { enableAutoComplete($('#overlay_status_form .status_top .status_spoiler'));
$('#overlay_status_form .status_textarea textarea').autoCompleteToken({instance:1,startkey:"@",endkey:" ",arrayname:"accounts",resultname:"acct"}); enableAutoComplete($('#overlay_status_form .status_textarea textarea'));
$('#overlay_status_form .status_textarea textarea').autoCompleteToken({instance:2,startkey:"#",endkey:" ",arrayname:"hashtags"});
$('#overlay_status_form .status_textarea textarea').autoCompleteToken({instance:3,startkey:":",endkey:";",source:actEmojiData,resultname:"name",callback:function() {
$('#overlay_status_form .status_textarea textarea').trigger({"type":"keyup","key":":"});
}});
}
$('#overlay_status_form input[name="privacy_option"]').val([privacy_mode]); $('#overlay_status_form input[name="privacy_option"]').val([privacy_mode]);
$('#overlay_status_form .expand_privacy_menu_button > i').attr('class', "fa fa-" + picon); $('#overlay_status_form .expand_privacy_menu_button > i').attr('class', "fa fa-" + picon);
if($(this).attr("display_name")) $('.overlay_status .overlay_status_header span').addClass("emoji_poss").html(__("Toot to")+" "+$(this).attr("display_name")); if($(this).attr("display_name")) $('.overlay_status .overlay_status_header span').addClass("emoji_poss").html(__("Toot to")+" "+$(this).attr("display_name"));
@ -1297,9 +1294,12 @@ $('#overlay_status_emoji').lsxEmojiPicker({
closeOnSelect:true, closeOnSelect:true,
twemoji:!checkEmojiSupport(), twemoji:!checkEmojiSupport(),
onSelect:function(emoji) { onSelect:function(emoji) {
$('#overlay_status_form .status_textarea textarea').insertText(":"+emoji.name+":"); $('#overlay_status_form .status_top .status_spoiler,#overlay_status_form .status_textarea textarea').each(function() {
$('#overlay_status_form .status_textarea textarea').trigger({"type":"keyup","key":":"}); if(global_focus_textfield == $(this).data("random")) {
var textLen = $('#overlay_status_form .status_textarea textarea').val().length * 2; $(this).insertText(":"+emoji.name+":");
$(this).trigger({"type":"keyup","key":":"});
}
});
} }
}); });
if(localStorage.setting_post_sensitive == "true") { if(localStorage.setting_post_sensitive == "true") {
@ -1313,6 +1313,7 @@ if(e.keyCode !== 224 & e.keyCode !== 17) {
if(e.key == ":") { if(e.key == ":") {
replace_emoji_textarea(this); replace_emoji_textarea(this);
} }
if($('#overlay_status_form textarea').length == 1) {
const textCount = $('#overlay_status_form textarea').val().length + $('#overlay_status_form .status_spoiler').val().length; const textCount = $('#overlay_status_form textarea').val().length + $('#overlay_status_form .status_spoiler').val().length;
let textLen = ( current_instance_charlimit - textCount ); let textLen = ( current_instance_charlimit - textCount );
if(textLen <= -1) { if(textLen <= -1) {
@ -1326,6 +1327,24 @@ is_ready = false;
} }
$('#overlay_status_form .character_count').text(textLen); $('#overlay_status_form .character_count').text(textLen);
} }
else {
is_ready = false;
$('#overlay_status_form .character_count').removeClass('red');
$('#overlay_status_form textarea').each(function() {
const textCount = $(this).val().length + $('#overlay_status_form .status_spoiler').val().length;
let textLen = ( current_instance_charlimit - textCount );
if(textLen <= -1) {
$('#overlay_status_form .character_count').addClass('red');
is_ready = true;
} else if(textLen === current_instance_charlimit) {
is_ready = true;
}
if($(this).is(":focus")) {
$('#overlay_status_form .character_count').text(textLen);
}
});
}
}
if($('#overlay_status_form .status_poll_editor').hasClass("invisible")) { if($('#overlay_status_form .status_poll_editor').hasClass("invisible")) {
if(is_ready) $('#overlay_status_form').addClass('ready'); if(is_ready) $('#overlay_status_form').addClass('ready');
else $('#overlay_status_form').removeClass('ready'); else $('#overlay_status_form').removeClass('ready');
@ -1340,6 +1359,7 @@ else $('#overlay_status_form').addClass('ready');
}); });
$(document).on('click','#overlay_status_form .status_CW', function(e) { $(document).on('click','#overlay_status_form .status_CW', function(e) {
$('#overlay_status_form .status_spoiler').toggleClass('invisible'); $('#overlay_status_form .status_spoiler').toggleClass('invisible');
$('#overlay_status_form .status_textarea').toggleClass('status_has_cw');
}); });
$(document).on('click','#overlay_status_form .status_poll', function(e) { $(document).on('click','#overlay_status_form .status_poll', function(e) {
$('#overlay_status_form .status_poll_editor').toggleClass('invisible'); $('#overlay_status_form .status_poll_editor').toggleClass('invisible');
@ -1349,6 +1369,12 @@ $('#overlay_status_form textarea').keyup();
$(document).on('click','#overlay_status_form .expand_privacy_menu_button', function(e) { $(document).on('click','#overlay_status_form .expand_privacy_menu_button', function(e) {
$('#overlay_status_form .expand_privacy_menu').removeClass('invisible'); $('#overlay_status_form .expand_privacy_menu').removeClass('invisible');
}); });
$(document).on('click','#overlay_status_form .status_addfield', function(e) {
var new_textarea = $("<textarea>").addClass("focus").addClass("additional_textarea").attr("name","status_textarea").data("random",Math.round(Math.random()*1000));
autosize(new_textarea);
enableAutoComplete(new_textarea);
$('#overlay_status_form textarea').last().after(new_textarea);
});
$(document).on('click','#overlay_status_form .status_privacy.select_privacy', function(e) { $(document).on('click','#overlay_status_form .status_privacy.select_privacy', function(e) {
e.stopPropagation(); e.stopPropagation();
$('#overlay_status_form .expand_privacy_menu_button > i').attr('class', $(this).attr('privacyicon')); $('#overlay_status_form .expand_privacy_menu_button > i').attr('class', $(this).attr('privacyicon'));
@ -1381,7 +1407,7 @@ $('#overlay_status_form .character_count').html('<i class="fa fa-circle-o-notch
const form = document.forms.overlay_status_form; const form = document.forms.overlay_status_form;
if (!$('#overlay_status_media_atta')[0].files.length || !$('#overlay_status_form .status_poll_editor').hasClass("invisible")) { if (!$('#overlay_status_media_atta')[0].files.length || !$('#overlay_status_form .status_poll_editor').hasClass("invisible")) {
const params = { const params = {
status : form.status_textarea.value, status:$('#overlay_status_form textarea'),
sensitive: form.status_nsfw.checked, sensitive: form.status_nsfw.checked,
spoiler_text : form.status_spoiler.value, spoiler_text : form.status_spoiler.value,
visibility : form.privacy_option.value visibility : form.privacy_option.value
@ -1397,7 +1423,7 @@ params.poll.expires_in = $('#overlay_status_form .poll_days').val()*86400+$('#ov
if($('#overlay_status_form .poll_multiple_choice')[0].checked) params.poll.multiple = "On"; if($('#overlay_status_form .poll_multiple_choice')[0].checked) params.poll.multiple = "On";
} }
} }
api.post("statuses", params, function (data) { submitStatusArray(params,function(data) {
$('#overlay_status_form .media_attachments_preview_area').empty(); $('#overlay_status_form .media_attachments_preview_area').empty();
$('#overlay_status_form .status_spoiler').addClass('invisible'); $('#overlay_status_form .status_spoiler').addClass('invisible');
$('#overlay_status_form .status_textarea .media_attachments_preview_area').addClass('invisible'); $('#overlay_status_form .status_textarea .media_attachments_preview_area').addClass('invisible');
@ -1425,13 +1451,13 @@ if ( i === 3 || i === filesLen ) {
api.postMedia("media", formData, function (postMedia) { api.postMedia("media", formData, function (postMedia) {
media_array.unshift(postMedia.id); media_array.unshift(postMedia.id);
const params = { const params = {
status : form.status_textarea.value, status:$('#overlay_status_form textarea'),
sensitive: form.status_nsfw.checked, sensitive: form.status_nsfw.checked,
spoiler_text : form.status_spoiler.value, spoiler_text : form.status_spoiler.value,
visibility : form.privacy_option.value, visibility : form.privacy_option.value,
media_ids: media_array media_ids: media_array
} }
api.post("statuses", params, function (data) { submitStatusArray(params,function(data) {
$('#overlay_status_form .media_attachments_preview_area').empty(); $('#overlay_status_form .media_attachments_preview_area').empty();
$('#overlay_status_form .status_spoiler').addClass('invisible'); $('#overlay_status_form .status_spoiler').addClass('invisible');
$('#overlay_status_form .status_textarea .media_attachments_preview_area').addClass('invisible'); $('#overlay_status_form .status_textarea .media_attachments_preview_area').addClass('invisible');
@ -1468,6 +1494,7 @@ $('#header_status_form .status_textarea textarea').removeClass('focus');
$('#header_status_form .status_bottom').addClass('invisible'); $('#header_status_form .status_bottom').addClass('invisible');
autosize.destroy($('#header_status_form .status_textarea textarea')); autosize.destroy($('#header_status_form .status_textarea textarea'));
$('#header_status_emoji').lsxEmojiPicker("destroy"); $('#header_status_emoji').lsxEmojiPicker("destroy");
$('#header_status_form .status_top .status_spoiler').autoCompleteToken("destroy");
$('#header_status_form .status_textarea textarea').autoCompleteToken("destroy"); $('#header_status_form .status_textarea textarea').autoCompleteToken("destroy");
$('#header_status_form .status_textarea').addClass("closed"); $('#header_status_form .status_textarea').addClass("closed");
} }
@ -1478,6 +1505,7 @@ if(e.keyCode !== 224 & e.keyCode !== 17) {
if(e.key == ":") { if(e.key == ":") {
replace_emoji_textarea(this); replace_emoji_textarea(this);
} }
if($('#header_status_form textarea').length == 1) {
const textCount = $('#header_status_form textarea').val().length + $('#header_status_form .status_spoiler').val().length; const textCount = $('#header_status_form textarea').val().length + $('#header_status_form .status_spoiler').val().length;
let textLen = ( current_instance_charlimit - textCount ); let textLen = ( current_instance_charlimit - textCount );
if(textLen <= -1) { if(textLen <= -1) {
@ -1491,6 +1519,24 @@ is_ready = false;
} }
$('#header_status_form .character_count').text(textLen); $('#header_status_form .character_count').text(textLen);
} }
else {
is_ready = false;
$('#header_status_form .character_count').removeClass('red');
$('#header_status_form textarea').each(function() {
const textCount = $(this).val().length + $('#header_status_form .status_spoiler').val().length;
let textLen = ( current_instance_charlimit - textCount );
if(textLen <= -1) {
$('#header_status_form .character_count').addClass('red');
is_ready = true;
} else if(textLen === current_instance_charlimit) {
is_ready = true;
}
if($(this).is(":focus")) {
$('#header_status_form .character_count').text(textLen);
}
});
}
}
if($('#header_status_form .status_poll_editor').hasClass("invisible")) { if($('#header_status_form .status_poll_editor').hasClass("invisible")) {
if(is_ready) $('#header_status_form').addClass('ready'); if(is_ready) $('#header_status_form').addClass('ready');
else $('#header_status_form').removeClass('ready'); else $('#header_status_form').removeClass('ready');
@ -1505,12 +1551,20 @@ else $('#header_status_form').addClass('ready');
}); });
$(document).on('click','#header_status_form .status_CW', function(e) { $(document).on('click','#header_status_form .status_CW', function(e) {
$('#header_status_form .status_spoiler').toggleClass('invisible'); $('#header_status_form .status_spoiler').toggleClass('invisible');
$('#header_status_form .status_textarea').toggleClass('status_has_cw');
$('#header_status_form .status_spoiler').val("");
}); });
$(document).on('click','#header_status_form .status_poll', function(e) { $(document).on('click','#header_status_form .status_poll', function(e) {
$('#header_status_form .status_poll_editor').toggleClass('invisible'); $('#header_status_form .status_poll_editor').toggleClass('invisible');
$('#header_status_form .status_media_attachment').toggleClass('disabled'); $('#header_status_form .status_media_attachment').toggleClass('disabled');
$('#header_status_form textarea').keyup(); $('#header_status_form textarea').keyup();
}); });
$(document).on('click','#header_status_form .status_addfield', function(e) {
var new_textarea = $("<textarea>").addClass("focus").addClass("additional_textarea").attr("name","status_textarea").data("random",Math.round(Math.random()*1000));
autosize(new_textarea);
enableAutoComplete(new_textarea);
$('#header_status_form textarea').last().after(new_textarea);
});
$(document).on('click','#header_status_form .expand_privacy_menu_button', function(e) { $(document).on('click','#header_status_form .expand_privacy_menu_button', function(e) {
$('#header_status_form .expand_privacy_menu').removeClass('invisible'); $('#header_status_form .expand_privacy_menu').removeClass('invisible');
}); });
@ -1533,13 +1587,8 @@ $('#header_status_form input[name="privacy_option"]').val([localStorage.getItem(
$('#header_status_form .expand_privacy_menu_button > i').attr('class', "fa fa-" + picon); $('#header_status_form .expand_privacy_menu_button > i').attr('class', "fa fa-" + picon);
$('#header_status_form .status_textarea textarea').addClass('focus'); $('#header_status_form .status_textarea textarea').addClass('focus');
autosize($('#header_status_form .status_textarea textarea')); autosize($('#header_status_form .status_textarea textarea'));
if(localStorage.setting_compose_autocomplete == "true") { enableAutoComplete($('#header_status_form .status_top .status_spoiler'));
$('#header_status_form .status_textarea textarea').autoCompleteToken({instance:1,startkey:"@",endkey:" ",arrayname:"accounts",resultname:"acct"}); enableAutoComplete($('#header_status_form .status_textarea textarea'));
$('#header_status_form .status_textarea textarea').autoCompleteToken({instance:2,startkey:"#",endkey:" ",arrayname:"hashtags"});
$('#header_status_form .status_textarea textarea').autoCompleteToken({instance:3,startkey:":",endkey:";",source:actEmojiData,resultname:"name",callback:function() {
$('#header_status_form .status_textarea textarea').trigger({"type":"keyup","key":":"});
}});
}
$('#header_status_form .status_bottom').removeClass('invisible'); $('#header_status_form .status_bottom').removeClass('invisible');
$('#header_status_form .submit_status_label').addClass('active_submit_button'); $('#header_status_form .submit_status_label').addClass('active_submit_button');
const textCount = $('#header_status_form textarea').val().length + $('#header_status_form .status_spoiler').val().length; const textCount = $('#header_status_form textarea').val().length + $('#header_status_form .status_spoiler').val().length;
@ -1549,9 +1598,12 @@ $('#header_status_emoji').lsxEmojiPicker({
closeOnSelect:true, closeOnSelect:true,
twemoji:!checkEmojiSupport(), twemoji:!checkEmojiSupport(),
onSelect:function(emoji) { onSelect:function(emoji) {
$('#header_status_form .status_textarea textarea').insertText(":"+emoji.name+":"); $('#header_status_form .status_top .status_spoiler,#header_status_form .status_textarea textarea').each(function() {
$('#header_status_form .status_textarea textarea').trigger({"type":"keyup","key":":"}); if(global_focus_textfield == $(this).data("random")) {
var textLen = $('#header_status_form .status_textarea textarea').val().length * 2; $(this).insertText(":"+emoji.name+":");
$(this).trigger({"type":"keyup","key":":"});
}
});
} }
}); });
if(localStorage.setting_post_sensitive == "true") { if(localStorage.setting_post_sensitive == "true") {
@ -1587,7 +1639,7 @@ $('#header_status_form .character_count').html('<i class="fa fa-circle-o-notch f
const form = document.forms.header_status_form; const form = document.forms.header_status_form;
if(!$('#header_status_media_atta')[0].files.length || !$('#header_status_form .status_poll_editor').hasClass("invisible")) { if(!$('#header_status_media_atta')[0].files.length || !$('#header_status_form .status_poll_editor').hasClass("invisible")) {
const params = { const params = {
status : form.status_textarea.value, status: $('#header_status_form textarea'),
sensitive: form.status_nsfw.checked, sensitive: form.status_nsfw.checked,
spoiler_text : form.status_spoiler.value, spoiler_text : form.status_spoiler.value,
visibility : form.privacy_option.value visibility : form.privacy_option.value
@ -1603,7 +1655,7 @@ params.poll.expires_in = $('#header_status_form .poll_days').val()*86400+$('#hea
if($('#header_status_form .poll_multiple_choice')[0].checked) params.poll.multiple = "On"; if($('#header_status_form .poll_multiple_choice')[0].checked) params.poll.multiple = "On";
} }
} }
api.post("statuses", params, function (data) { submitStatusArray(params,function(data) {
$('#header_status_form .media_attachments_preview_area').empty(); $('#header_status_form .media_attachments_preview_area').empty();
$('#header_status_form .status_spoiler').addClass('invisible'); $('#header_status_form .status_spoiler').addClass('invisible');
$('#header_status_form .status_textarea .media_attachments_preview_area').addClass('invisible'); $('#header_status_form .status_textarea .media_attachments_preview_area').addClass('invisible');
@ -1613,6 +1665,7 @@ $('#header_status_form').removeClass('ready');
$('#header_status_form .status_textarea').removeClass('disallow_select'); $('#header_status_form .status_textarea').removeClass('disallow_select');
$('#header_status_form .character_count').html(current_instance_charlimit); $('#header_status_form .character_count').html(current_instance_charlimit);
$(document).click(); $(document).click();
$('#header_status_form .additional_textarea').remove();
}); });
} else { } else {
const dummy_form = $('<form></form>').append($('#header_status_media_atta')), const dummy_form = $('<form></form>').append($('#header_status_media_atta')),
@ -1627,13 +1680,13 @@ if ( i === 3 || i === filesLen ) {
api.postMedia("media", formData, function (postMedia) { api.postMedia("media", formData, function (postMedia) {
media_array.unshift(postMedia.id); media_array.unshift(postMedia.id);
const params = { const params = {
status : form.status_textarea.value, status : $('#header_status_form textarea'),
sensitive: form.status_nsfw.checked, sensitive: form.status_nsfw.checked,
spoiler_text : form.status_spoiler.value, spoiler_text : form.status_spoiler.value,
visibility : form.privacy_option.value, visibility : form.privacy_option.value,
media_ids: media_array media_ids: media_array
} }
api.post("statuses", params, function (data) { submitStatusArray(params,function(data) {
$('#header_status_form .media_attachments_preview_area').empty(); $('#header_status_form .media_attachments_preview_area').empty();
$('#header_status_form .status_spoiler').addClass('invisible'); $('#header_status_form .status_spoiler').addClass('invisible');
$('#header_status_form .status_textarea .media_attachments_preview_area').addClass('invisible'); $('#header_status_form .status_textarea .media_attachments_preview_area').addClass('invisible');
@ -1643,6 +1696,7 @@ $('#header_status_form').removeClass('ready');
$('#header_status_form .status_textarea').removeClass('disallow_select'); $('#header_status_form .status_textarea').removeClass('disallow_select');
$('#header_status_form .character_count').html(current_instance_charlimit); $('#header_status_form .character_count').html(current_instance_charlimit);
$(document).click(); $(document).click();
$('#header_status_form .additional_textarea').remove();
}); });
}); });
break; break;
@ -1664,6 +1718,8 @@ $('#reply_status_form .status_bottom').addClass('invisible');
$('#reply_status_form .status_textarea textarea').removeClass('focus'); $('#reply_status_form .status_textarea textarea').removeClass('focus');
$('#reply_status_form .submit_status_label').removeClass('active_submit_button'); $('#reply_status_form .submit_status_label').removeClass('active_submit_button');
$('#reply_status_emoji').lsxEmojiPicker("destroy"); $('#reply_status_emoji').lsxEmojiPicker("destroy");
$('#reply_status_form .status_top .status_spoiler').autoCompleteToken("destroy");
$('#reply_status_form .status_textarea textarea').autoCompleteToken("destroy");
} }
}); });
$(document).on('click','#reply_status_form', function(e) { $(document).on('click','#reply_status_form', function(e) {
@ -1678,13 +1734,8 @@ replyto += "@"+mentions[i].acct+" ";
} }
$('#reply_status_form .status_textarea textarea').addClass('focus'); $('#reply_status_form .status_textarea textarea').addClass('focus');
autosize($('#reply_status_form .status_textarea textarea')); autosize($('#reply_status_form .status_textarea textarea'));
if(localStorage.setting_compose_autocomplete == "true") { enableAutoComplete($('#reply_status_form .status_top .status_spoiler'));
$('#reply_status_form .status_textarea textarea').autoCompleteToken({instance:1,startkey:"@",endkey:" ",arrayname:"accounts",resultname:"acct"}); enableAutoComplete($('#reply_status_form .status_textarea textarea'));
$('#reply_status_form .status_textarea textarea').autoCompleteToken({instance:2,startkey:"#",endkey:" ",arrayname:"hashtags"});
$('#reply_status_form .status_textarea textarea').autoCompleteToken({instance:3,startkey:":",endkey:";",source:actEmojiData,resultname:"name",callback:function() {
$('#reply_status_form .status_textarea textarea').trigger({"type":"keyup","key":":"});
}});
}
$('#reply_status_form .status_bottom').removeClass('invisible'); $('#reply_status_form .status_bottom').removeClass('invisible');
$('#reply_status_form .submit_status_label').addClass('active_submit_button'); $('#reply_status_form .submit_status_label').addClass('active_submit_button');
$('#reply_status_form textarea').val(replyto); $('#reply_status_form textarea').val(replyto);
@ -1696,9 +1747,12 @@ $('#reply_status_emoji').lsxEmojiPicker({
closeOnSelect:true, closeOnSelect:true,
twemoji:!checkEmojiSupport(), twemoji:!checkEmojiSupport(),
onSelect:function(emoji) { onSelect:function(emoji) {
$('#reply_status_form .status_textarea textarea').insertText(":"+emoji.name+":"); $('#reply_status_form .status_top .status_spoiler,#reply_status_form .status_textarea textarea').each(function() {
$('#reply_status_form .status_textarea textarea').trigger({"type":"keyup","key":":"}); if(global_focus_textfield == $(this).data("random")) {
var textLen = $('#reply_status_form .status_textarea textarea').val().length * 2; $(this).insertText(":"+emoji.name+":");
$(this).trigger({"type":"keyup","key":":"});
}
});
} }
}); });
if(localStorage.setting_post_sensitive == "true") { if(localStorage.setting_post_sensitive == "true") {
@ -1713,6 +1767,7 @@ if(e.keyCode !== 224 & e.keyCode !== 17) {
if(e.key == ":") { if(e.key == ":") {
replace_emoji_textarea(this); replace_emoji_textarea(this);
} }
if($('#reply_status_form textarea').length == 1) {
const textCount = $('#reply_status_form textarea').val().length + $('#reply_status_form .status_spoiler').val().length; const textCount = $('#reply_status_form textarea').val().length + $('#reply_status_form .status_spoiler').val().length;
let textLen = ( current_instance_charlimit - textCount ); let textLen = ( current_instance_charlimit - textCount );
if(textLen <= -1) { if(textLen <= -1) {
@ -1726,6 +1781,24 @@ is_ready = false;
} }
$('#reply_status_form .character_count').text(textLen); $('#reply_status_form .character_count').text(textLen);
} }
else {
is_ready = false;
$('#reply_status_form .character_count').removeClass('red');
$('#reply_status_form textarea').each(function() {
const textCount = $(this).val().length + $('#reply_status_form .status_spoiler').val().length;
let textLen = ( current_instance_charlimit - textCount );
if(textLen <= -1) {
$('#reply_status_form .character_count').addClass('red');
is_ready = true;
} else if(textLen === current_instance_charlimit) {
is_ready = true;
}
if($(this).is(":focus")) {
$('#reply_status_form .character_count').text(textLen);
}
});
}
}
if($('#reply_status_form .status_poll_editor').hasClass("invisible")) { if($('#reply_status_form .status_poll_editor').hasClass("invisible")) {
if(is_ready) $('#reply_status_form').addClass('ready'); if(is_ready) $('#reply_status_form').addClass('ready');
else $('#reply_status_form').removeClass('ready'); else $('#reply_status_form').removeClass('ready');
@ -1740,12 +1813,19 @@ else $('#reply_status_form').addClass('ready');
}); });
$(document).on('click','#reply_status_form .status_CW', function(e) { $(document).on('click','#reply_status_form .status_CW', function(e) {
$('#reply_status_form .status_spoiler').toggleClass('invisible'); $('#reply_status_form .status_spoiler').toggleClass('invisible');
$('#reply_status_form .status_textarea').toggleClass('status_has_cw');
}); });
$(document).on('click','#reply_status_form .status_poll', function(e) { $(document).on('click','#reply_status_form .status_poll', function(e) {
$('#reply_status_form .status_poll_editor').toggleClass('invisible'); $('#reply_status_form .status_poll_editor').toggleClass('invisible');
$('#reply_status_form .status_media_attachment').toggleClass('disabled'); $('#reply_status_form .status_media_attachment').toggleClass('disabled');
$('#reply_status_form textarea').keyup(); $('#reply_status_form textarea').keyup();
}); });
$(document).on('click','#reply_status_form .status_addfield', function(e) {
var new_textarea = $("<textarea>").addClass("focus").addClass("additional_textarea").attr("name","status_textarea").data("random",Math.round(Math.random()*1000));
autosize(new_textarea);
enableAutoComplete(new_textarea);
$('#reply_status_form textarea').last().after(new_textarea);
});
$(document).on('click','#reply_status_form .expand_privacy_menu_button', function(e) { $(document).on('click','#reply_status_form .expand_privacy_menu_button', function(e) {
$('#reply_status_form .expand_privacy_menu').removeClass('invisible'); $('#reply_status_form .expand_privacy_menu').removeClass('invisible');
}); });
@ -1781,7 +1861,7 @@ $('#reply_status_form .character_count').html('<i class="fa fa-circle-o-notch fa
let form = document.forms.reply_status_form; let form = document.forms.reply_status_form;
if(!$('#reply_status_media_atta')[0].files.length || !$('#reply_status_form .status_poll_editor').hasClass("invisible")) { if(!$('#reply_status_media_atta')[0].files.length || !$('#reply_status_form .status_poll_editor').hasClass("invisible")) {
const params = { const params = {
status : form.status_textarea.value, status:$('#reply_status_form textarea'),
sensitive: form.status_nsfw.checked, sensitive: form.status_nsfw.checked,
spoiler_text : form.status_spoiler.value, spoiler_text : form.status_spoiler.value,
visibility : form.privacy_option.value, visibility : form.privacy_option.value,
@ -1798,7 +1878,7 @@ params.poll.expires_in = $('#reply_status_form .poll_days').val()*86400+$('#repl
if($('#reply_status_form .poll_multiple_choice')[0].checked) params.poll.multiple = "On"; if($('#reply_status_form .poll_multiple_choice')[0].checked) params.poll.multiple = "On";
} }
} }
api.post("statuses", params, function (data) { submitStatusArray(params,function(data) {
$('#reply_status_form .media_attachments_preview_area').empty(); $('#reply_status_form .media_attachments_preview_area').empty();
$('#reply_status_form .status_spoiler').addClass('invisible'); $('#reply_status_form .status_spoiler').addClass('invisible');
$('#reply_status_form .status_textarea .media_attachments_preview_area').addClass('invisible'); $('#reply_status_form .status_textarea .media_attachments_preview_area').addClass('invisible');
@ -1825,14 +1905,14 @@ if ( i === 3 || i === filesLen ) {
api.postMedia("media", formData, function (postMedia) { api.postMedia("media", formData, function (postMedia) {
media_array.unshift(postMedia.id); media_array.unshift(postMedia.id);
const params = { const params = {
status : form.status_textarea.value, status:$('#reply_status_form textarea'),
sensitive: form.status_nsfw.checked, sensitive: form.status_nsfw.checked,
spoiler_text : form.status_spoiler.value, spoiler_text : form.status_spoiler.value,
visibility : form.privacy_option.value, visibility : form.privacy_option.value,
media_ids: media_array, media_ids: media_array,
in_reply_to_id : $('#reply_status_form').attr('sid') in_reply_to_id : $('#reply_status_form').attr('sid')
} }
api.post("statuses", params, function (data) { submitStatusArray(params,function(data) {
$('#reply_status_form .media_attachments_preview_area').empty(); $('#reply_status_form .media_attachments_preview_area').empty();
$('#reply_status_form .status_spoiler').addClass('invisible'); $('#reply_status_form .status_spoiler').addClass('invisible');
$('#reply_status_form .status_textarea .media_attachments_preview_area').addClass('invisible'); $('#reply_status_form .status_textarea .media_attachments_preview_area').addClass('invisible');
@ -1861,6 +1941,8 @@ $(function() {
$(document).on('click', function(e) { $(document).on('click', function(e) {
if(!$(e.target).closest('.reply_button').length && !$(e.target).closest('.single_reply_status').length) { if(!$(e.target).closest('.reply_button').length && !$(e.target).closest('.single_reply_status').length) {
$('#single_reply_status_emoji').lsxEmojiPicker("destroy"); $('#single_reply_status_emoji').lsxEmojiPicker("destroy");
$('#single_status_form .status_top .status_spoiler').autoCompleteToken("destroy");
$('#single_status_form .status_textarea textarea').autoCompleteToken("destroy");
} }
}); });
$(document).on('click','single_reply_status_header, #single_reply_status_form', function(e) { $(document).on('click','single_reply_status_header, #single_reply_status_form', function(e) {
@ -1895,13 +1977,8 @@ $('.single_reply_status .submit_status_label').addClass('active_submit_button');
$('#single_reply_status_form .status_textarea textarea').addClass('focus'); $('#single_reply_status_form .status_textarea textarea').addClass('focus');
$('#single_reply_status_form .status_textarea textarea').focus(); $('#single_reply_status_form .status_textarea textarea').focus();
autosize($('#single_reply_status_form .status_textarea textarea')); autosize($('#single_reply_status_form .status_textarea textarea'));
if(localStorage.setting_compose_autocomplete == "true") { enableAutoComplete($('#single_reply_status_form .status_top .status_spoiler'));
$('#single_reply_status_form .status_textarea textarea').autoCompleteToken({instance:1,startkey:"@",endkey:" ",arrayname:"accounts",resultname:"acct"}); enableAutoComplete($('#single_reply_status_form .status_textarea textarea'));
$('#single_reply_status_form .status_textarea textarea').autoCompleteToken({instance:2,startkey:"#",endkey:" ",arrayname:"hashtags"});
$('#single_reply_status_form .status_textarea textarea').autoCompleteToken({instance:3,startkey:":",endkey:";",source:actEmojiData,resultname:"name",callback:function() {
$('#single_reply_status_form .status_textarea textarea').trigger({"type":"keyup","key":":"});
}});
}
$('#single_reply_status_form input[name="privacy_option"]').val([privacy_mode]); $('#single_reply_status_form input[name="privacy_option"]').val([privacy_mode]);
$('#single_reply_status_form .expand_privacy_menu_button > i').attr('class', "fa fa-" + picon); $('#single_reply_status_form .expand_privacy_menu_button > i').attr('class', "fa fa-" + picon);
$('#single_reply_status_form').attr('tid',sid); $('#single_reply_status_form').attr('tid',sid);
@ -1914,9 +1991,12 @@ $('#single_reply_status_emoji').lsxEmojiPicker({
closeOnSelect:true, closeOnSelect:true,
twemoji:!checkEmojiSupport(), twemoji:!checkEmojiSupport(),
onSelect:function(emoji) { onSelect:function(emoji) {
$('#single_reply_status_form .status_textarea textarea').insertText(":"+emoji.name+":"); $('#single_reply_status_form .status_top .status_spoiler,#single_reply_status_form .status_textarea textarea').each(function() {
$('#single_reply_status_form .status_textarea textarea').trigger({"type":"keyup","key":":"}); if(global_focus_textfield == $(this).data("random")) {
var textLen = $('#single_reply_status_form .status_textarea textarea').val().length * 2; $(this).insertText(":"+emoji.name+":");
$(this).trigger({"type":"keyup","key":":"});
}
});
} }
}); });
if(localStorage.setting_post_sensitive == "true") { if(localStorage.setting_post_sensitive == "true") {
@ -1936,6 +2016,7 @@ if(e.keyCode !== 224 & e.keyCode !== 17) {
if(e.key == ":") { if(e.key == ":") {
replace_emoji_textarea(this); replace_emoji_textarea(this);
} }
if($('#single_reply_status_form textarea').length == 1) {
const textCount = $('#single_reply_status_form textarea').val().length + $('#single_reply_status_form .status_spoiler').val().length; const textCount = $('#single_reply_status_form textarea').val().length + $('#single_reply_status_form .status_spoiler').val().length;
let textLen = ( current_instance_charlimit - textCount ); let textLen = ( current_instance_charlimit - textCount );
if(textLen <= -1) { if(textLen <= -1) {
@ -1949,6 +2030,24 @@ is_ready = false;
} }
$('#single_reply_status_form .character_count').text(textLen); $('#single_reply_status_form .character_count').text(textLen);
} }
else {
is_ready = false;
$('#single_reply_status_form .character_count').removeClass('red');
$('#single_reply_status_form textarea').each(function() {
const textCount = $(this).val().length + $('#single_reply_status_form .status_spoiler').val().length;
let textLen = ( current_instance_charlimit - textCount );
if(textLen <= -1) {
$('#single_reply_status_form .character_count').addClass('red');
is_ready = true;
} else if(textLen === current_instance_charlimit) {
is_ready = true;
}
if($(this).is(":focus")) {
$('#single_reply_status_form .character_count').text(textLen);
}
});
}
}
if($('#single_reply_status_form .status_poll_editor').hasClass("invisible")) { if($('#single_reply_status_form .status_poll_editor').hasClass("invisible")) {
if(is_ready) $('#single_reply_status_form').addClass('ready'); if(is_ready) $('#single_reply_status_form').addClass('ready');
else $('#single_reply_status_form').removeClass('ready'); else $('#single_reply_status_form').removeClass('ready');
@ -1963,12 +2062,19 @@ else $('#single_reply_status_form').addClass('ready');
}); });
$(document).on('click','#single_reply_status_form .status_CW', function(e) { $(document).on('click','#single_reply_status_form .status_CW', function(e) {
$('#single_reply_status_form .status_spoiler').toggleClass('invisible'); $('#single_reply_status_form .status_spoiler').toggleClass('invisible');
$('#single_reply_status_form .status_textarea').toggleClass('status_has_cw');
}); });
$(document).on('click','#single_reply_status_form .status_poll', function(e) { $(document).on('click','#single_reply_status_form .status_poll', function(e) {
$('#single_reply_status_form .status_poll_editor').toggleClass('invisible'); $('#single_reply_status_form .status_poll_editor').toggleClass('invisible');
$('#single_reply_status_form .status_media_attachment').toggleClass('disabled'); $('#single_reply_status_form .status_media_attachment').toggleClass('disabled');
$('#single_reply_status_form textarea').keyup(); $('#single_reply_status_form textarea').keyup();
}); });
$(document).on('click','#single_reply_status_form .status_addfield', function(e) {
var new_textarea = $("<textarea>").addClass("focus").attr("name","status_textarea").data("random",Math.round(Math.random()*1000));
autosize(new_textarea);
enableAutoComplete(new_textarea);
$('#single_reply_status_form textarea').last().after(new_textarea);
});
$(document).on('click','#single_reply_status_form .expand_privacy_menu_button', function(e) { $(document).on('click','#single_reply_status_form .expand_privacy_menu_button', function(e) {
$('#single_reply_status_form .expand_privacy_menu').removeClass('invisible'); $('#single_reply_status_form .expand_privacy_menu').removeClass('invisible');
}); });
@ -2004,7 +2110,7 @@ $('#single_reply_status_form .character_count').html('<i class="fa fa-circle-o-n
let form = document.forms.single_reply_status_form; let form = document.forms.single_reply_status_form;
if(!$('#single_reply_status_media_atta')[0].files.length || !$('#single_reply_status_form .status_poll_editor').hasClass("invisible")) { if(!$('#single_reply_status_media_atta')[0].files.length || !$('#single_reply_status_form .status_poll_editor').hasClass("invisible")) {
const params = { const params = {
status : form.status_textarea.value, status:$('#single_reply_status_form textarea'),
sensitive: form.status_nsfw.checked, sensitive: form.status_nsfw.checked,
spoiler_text : form.status_spoiler.value, spoiler_text : form.status_spoiler.value,
visibility : form.privacy_option.value, visibility : form.privacy_option.value,
@ -2021,7 +2127,7 @@ params.poll.expires_in = $('#single_reply_status_form .poll_days').val()*86400+$
if($('#single_reply_status_form .poll_multiple_choice')[0].checked) params.poll.multiple = "On"; if($('#single_reply_status_form .poll_multiple_choice')[0].checked) params.poll.multiple = "On";
} }
} }
api.post("statuses", params, function (data) { submitStatusArray(params,function(data) {
$('#single_reply_status_form .media_attachments_preview_area').empty(); $('#single_reply_status_form .media_attachments_preview_area').empty();
$('#single_reply_status_form .status_spoiler').addClass('invisible'); $('#single_reply_status_form .status_spoiler').addClass('invisible');
$('#single_reply_status_form .status_textarea .media_attachments_preview_area').addClass('invisible'); $('#single_reply_status_form .status_textarea .media_attachments_preview_area').addClass('invisible');
@ -2052,14 +2158,14 @@ if ( i === 3 || i === filesLen ) {
api.postMedia("media", formData, function (postMedia) { api.postMedia("media", formData, function (postMedia) {
media_array.unshift(postMedia.id); media_array.unshift(postMedia.id);
const params = { const params = {
status : form.status_textarea.value, status:$('#single_reply_status_form textarea'),
sensitive: form.status_nsfw.checked, sensitive: form.status_nsfw.checked,
spoiler_text : form.status_spoiler.value, spoiler_text : form.status_spoiler.value,
visibility : form.privacy_option.value, visibility : form.privacy_option.value,
media_ids: media_array, media_ids: media_array,
in_reply_to_id : $('#single_reply_status_form').attr('tid') in_reply_to_id : $('#single_reply_status_form').attr('tid')
} }
api.post("statuses", params, function (data) { submitStatusArray(params,function(data) {
$('#single_reply_status_form .media_attachments_preview_area').empty(); $('#single_reply_status_form .media_attachments_preview_area').empty();
$('#single_reply_status_form .status_spoiler').addClass('invisible'); $('#single_reply_status_form .status_spoiler').addClass('invisible');
$('#single_reply_status_form .status_textarea .media_attachments_preview_area').addClass('invisible'); $('#single_reply_status_form .status_textarea .media_attachments_preview_area').addClass('invisible');
@ -2237,7 +2343,7 @@ $('#js-overlay_content .temporary_object, #js-overlay_content .parmanent_object'
$('#js-overlay_content_wrap .overlay_status.submit_status_label').removeClass('active_submit_button'); $('#js-overlay_content_wrap .overlay_status.submit_status_label').removeClass('active_submit_button');
$('#js-overlay_content_wrap .single_reply_status .submit_status_label').removeClass('active_submit_button'); $('#js-overlay_content_wrap .single_reply_status .submit_status_label').removeClass('active_submit_button');
$('#js-overlay_content_wrap #reply_status_form .submit_status_label').removeClass('active_submit_button'); $('#js-overlay_content_wrap #reply_status_form .submit_status_label').removeClass('active_submit_button');
$('#js-overlay_content_wrap #header_status_form.submit_status_label').removeClass('active_submit_button'); $('#js-overlay_content_wrap #header_status_form .submit_status_label').removeClass('active_submit_button');
$('#js-overlay_content_wrap').removeClass('black_05'); $('#js-overlay_content_wrap').removeClass('black_05');
$('#js-overlay_content_wrap').removeClass('black_08'); $('#js-overlay_content_wrap').removeClass('black_08');
$('#js-overlay_content_wrap .overlay_confirm_yes').off('click'); $('#js-overlay_content_wrap .overlay_confirm_yes').off('click');
@ -2245,6 +2351,7 @@ $('#js-overlay_content_wrap .overlay_prompt_ok').off('click');
$('#js-overlay_content_wrap .overlay_prompt_text').val(""); $('#js-overlay_content_wrap .overlay_prompt_text').val("");
$('#js-overlay_content_wrap .overlay_addlist_body').empty(); $('#js-overlay_content_wrap .overlay_addlist_body').empty();
$('#js-overlay_content_wrap #addfilter').trigger("reset"); $('#js-overlay_content_wrap #addfilter').trigger("reset");
$('#js-overlay_content_wrap .status_form .additional_textarea').remove();
if(window.current_file) { if(window.current_file) {
if(current_file === "/user") { if(current_file === "/user") {
history.pushState(null, null, "/"+location.pathname.split("/")[1]+location.search); history.pushState(null, null, "/"+location.pathname.split("/")[1]+location.search);
@ -2316,6 +2423,10 @@ $(".poll_"+poll_id).remove();
} }
return false; return false;
}); });
$(document).on('focus','.status_textarea textarea,.status_top .status_spoiler',function(e) {
global_focus_textfield = $(this).data("random");
$(".status_textarea textarea").change();
});
shortcut.add("n",function() { shortcut.add("n",function() {
$("#creat_status").click(); $("#creat_status").click();
},{ },{

1
docker/locale/locale.gen
View File

@ -8,3 +8,4 @@ gl_ES.UTF-8 UTF-8
it_IT.UTF-8 UTF-8 it_IT.UTF-8 UTF-8
cs_CZ.UTF-8 UTF-8 cs_CZ.UTF-8 UTF-8
fr_FR.UTF-8 UTF-8 fr_FR.UTF-8 UTF-8
nl_NL.UTF-8 UTF-8

BIN
locale/de_DE/LC_MESSAGES/messages.mo
View File

Binary file not shown.

95
locale/de_DE/LC_MESSAGES/messages.po
View File

@ -1,19 +1,18 @@
# Niklas Poslovski <ni.pos@yandex.com>, 2018. #zanata
# Niklas Poslovski <ni.pos@yandex.com>, 2019. #zanata
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-19 16:33+0000\n" "POT-Creation-Date: 2019-05-07 17:11+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2019-03-05 12:45+0000\n" "X-Generator: Translate Toolkit 2.2.5\n"
"Last-Translator: Thiemo Tiziani <thiemo.tiziani@dev-wiki.de>\n" "X-Pootle-Path: /de/halcyon/de.po\n"
"Language-Team: German\n" "X-Pootle-Revision: 100\n"
"Language: de\n"
"X-Generator: Zanata 4.6.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgid "Language" msgid "Language"
msgstr "Sprache" msgstr "Sprache"
@ -42,6 +41,12 @@ msgstr "Portugiesisch (Brasilien)"
msgid "Language_it_IT" msgid "Language_it_IT"
msgstr "Italienisch" msgstr "Italienisch"
msgid "Language_cs_CZ"
msgstr "Tschechisch"
msgid "Language_fr_FR"
msgstr "Französisch"
msgid "Sensitive content" msgid "Sensitive content"
msgstr "Sensitiver Inhalt" msgstr "Sensitiver Inhalt"
@ -826,6 +831,15 @@ msgstr "Nachricht"
msgid "Filter" msgid "Filter"
msgstr "Filter" msgstr "Filter"
msgid "second"
msgstr "Sekunde"
msgid "seconds"
msgstr "Sekunden"
msgid "minute"
msgstr "Minute"
msgid "minutes" msgid "minutes"
msgstr "Minuten" msgstr "Minuten"
@ -838,6 +852,9 @@ msgstr "Stunden"
msgid "day" msgid "day"
msgstr "Tag" msgstr "Tag"
msgid "days"
msgstr "Tage"
msgid "week" msgid "week"
msgstr "Woche" msgstr "Woche"
@ -853,3 +870,63 @@ msgstr "FILTER"
msgid "MEDIA" msgid "MEDIA"
msgstr "MEDIEN" msgstr "MEDIEN"
msgid "Dark theme reset to standard"
msgstr "Dunkles Thema wird auf Standard zurückgesetzt"
msgid "Pictures shown in full height"
msgstr "Bilder werden in voller Höhe gezeigt"
msgid "Pictures shown in default height"
msgstr "Bilder werden in Standardhöhe angezeigt"
msgid "Threads shown in thread view"
msgstr "Threads werden in der Thread-Ansicht angezeigt"
msgid "Threads shown in chronological order"
msgstr "Die Themen werden in chronologischer Reihenfolge angezeigt"
msgid "Final results"
msgstr "Endergebnisse"
msgid "votes"
msgstr "Abstimmungen"
msgid "left"
msgstr "links"
msgid "Vote"
msgstr "Abstimmung"
msgid "A poll you participated in has ended"
msgstr "Eine Umfrage, an der Sie teilgenommen haben, ist beendet"
msgid "Days"
msgstr "Tage"
msgid "Hours"
msgstr "Stunden"
msgid "Minutes"
msgstr "Minuten"
msgid "Multiple choice"
msgstr "Mehrfachauswahl"
msgid "Poll finished"
msgstr "Umfrage beendet"
msgid ""
"If you close the overlay, your text will get deleted! Are you sure you want "
"to close it?"
msgstr ""
"Wenn du das Overlay schließt, wird dein Text gelöscht! Bist du sicher, dass "
"du es schließen willst?"
msgid "Website"
msgstr "Webseite"
msgid "Show pictures in full height"
msgstr "Bilder in voller Höhe anzeigen"
msgid "Show threads in thread view in timeline"
msgstr "Threads in der Thread-Ansicht in der Timeline anzeigen"

BIN
locale/en_US/LC_MESSAGES/messages.mo
View File

Binary file not shown.

101
locale/en_US/LC_MESSAGES/messages.po
View File

@ -1,19 +1,18 @@
# Niklas Poslovski <ni.pos@yandex.com>, 2018. #zanata
# Niklas Poslovski <ni.pos@yandex.com>, 2019. #zanata
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-19 16:33+0000\n" "POT-Creation-Date: 2019-05-07 17:12+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: en\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2019-01-19 04:39+0000\n" "X-Generator: Translate Toolkit 2.2.5\n"
"Last-Translator: Niklas Poslovski <ni.pos@yandex.com>\n" "X-Pootle-Path: /en/halcyon/en.po\n"
"Language-Team: English (United States)\n" "X-Pootle-Revision: 75\n"
"Language: en\n"
"X-Generator: Zanata 4.6.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgid "Language" msgid "Language"
msgstr "Language" msgstr "Language"
@ -21,15 +20,9 @@ msgstr "Language"
msgid "Language_en_US" msgid "Language_en_US"
msgstr "English (US)" msgstr "English (US)"
msgid "Language_cs_CZ"
msgstr "Czech"
msgid "Language_de_DE" msgid "Language_de_DE"
msgstr "German" msgstr "German"
msgid "Language_fr_FR"
msgstr "French"
msgid "Language_ja_JP" msgid "Language_ja_JP"
msgstr "Japanese" msgstr "Japanese"
@ -48,6 +41,12 @@ msgstr "Portuguese (Brazil)"
msgid "Language_it_IT" msgid "Language_it_IT"
msgstr "Italian" msgstr "Italian"
msgid "Language_cs_CZ"
msgstr "Czech"
msgid "Language_fr_FR"
msgstr "French"
msgid "Sensitive content" msgid "Sensitive content"
msgstr "Sensitive content" msgstr "Sensitive content"
@ -831,6 +830,15 @@ msgstr "Message"
msgid "Filter" msgid "Filter"
msgstr "Filter" msgstr "Filter"
msgid "second"
msgstr "second"
msgid "seconds"
msgstr "seconds"
msgid "minute"
msgstr "minute"
msgid "minutes" msgid "minutes"
msgstr "minutes" msgstr "minutes"
@ -843,6 +851,9 @@ msgstr "hours"
msgid "day" msgid "day"
msgstr "day" msgstr "day"
msgid "days"
msgstr "days"
msgid "week" msgid "week"
msgstr "week" msgstr "week"
@ -858,3 +869,63 @@ msgstr "FILTERS"
msgid "MEDIA" msgid "MEDIA"
msgstr "MEDIA" msgstr "MEDIA"
msgid "Dark theme reset to standard"
msgstr "Dark theme reset to standard"
msgid "Pictures shown in full height"
msgstr "Pictures shown in full height"
msgid "Pictures shown in default height"
msgstr "Pictures shown in default height"
msgid "Threads shown in thread view"
msgstr "Threads shown in thread view"
msgid "Threads shown in chronological order"
msgstr "Threads shown in chronological order"
msgid "Final results"
msgstr "Final results"
msgid "votes"
msgstr "votes"
msgid "left"
msgstr "left"
msgid "Vote"
msgstr "Vote"
msgid "A poll you participated in has ended"
msgstr "A poll you participated in has ended"
msgid "Days"
msgstr "Days"
msgid "Hours"
msgstr "Hours"
msgid "Minutes"
msgstr "Minutes"
msgid "Multiple choice"
msgstr "Multiple choice"
msgid "Poll finished"
msgstr "Poll finished"
msgid ""
"If you close the overlay, your text will get deleted! Are you sure you want "
"to close it?"
msgstr ""
"If you close the overlay, your text will get deleted! Are you sure you want "
"to close it?"
msgid "Website"
msgstr "Website"
msgid "Show pictures in full height"
msgstr "Show pictures in full height"
msgid "Show threads in thread view in timeline"
msgstr "Show threads in thread view in timeline"

BIN
locale/nl_NL/LC_MESSAGES/messages.mo Normal file
View File

Binary file not shown.

933
locale/nl_NL/LC_MESSAGES/messages.po Normal file
View File

@ -0,0 +1,933 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-07 17:09+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 2.2.5\n"
"X-Pootle-Path: /nl/halcyon/nl.po\n"
"X-Pootle-Revision: 210\n"
msgid "Language"
msgstr "Taal"
msgid "Language_en_US"
msgstr "Engels (VS)"
msgid "Language_de_DE"
msgstr "Duits"
msgid "Language_ja_JP"
msgstr "Japans"
msgid "Language_ko_KR"
msgstr "Koreaans"
msgid "Language_pl_PL"
msgstr "Pools"
msgid "Language_gl_ES"
msgstr "Galicisch"
msgid "Language_pt_BR"
msgstr "Portugees (Brazilië)"
msgid "Language_it_IT"
msgstr "Italiaans"
msgid "Language_cs_CZ"
msgstr "Tsjechisch"
msgid "Language_fr_FR"
msgstr "Frans"
msgid "Sensitive content"
msgstr "Gevoelige inhoud"
msgid "Click to view"
msgstr "Klik om te bekijken"
msgid "SHOW MORE"
msgstr "MEER TONEN"
msgid "SHOW LESS"
msgstr "MINDER TONEN"
msgid "Public"
msgstr "Openbaar"
msgid "Unlisted"
msgstr "Minder openbaar"
msgid "Followers-only"
msgstr "Alleen volgers"
msgid "Direct"
msgstr "Direct"
msgid "Delete Toot"
msgstr "Toot verwijderen"
msgid "Unpin Toot"
msgstr "Toot losmaken"
msgid "Pin Toot"
msgstr "Toot vastmaken"
msgid "Mute"
msgstr "Negeren"
msgid "Block"
msgstr "Blokkeren"
msgid "Report this Toot"
msgstr "Deze toot rapporteren"
msgid "Copy link to Toot"
msgstr "Link naar toot kopiëren"
msgid "View original"
msgstr "Origineel bekijken"
msgid "Boosted"
msgstr "Geboost"
msgid "Pinned Toot"
msgstr "Vastgemaakte toot"
msgid "favourited Your Toot"
msgstr "voegde jouw toot als favoriet toe"
msgid "boosted Your Toot"
msgstr "boostte jouw toot"
msgid "followed you"
msgstr "volgt jou nu"
msgid "Follow"
msgstr "Volgen"
msgid "Toot your reply"
msgstr "Toot jouw reactie"
msgid "Reply"
msgstr "Reageren"
msgid "Content warning"
msgstr "Tekstwaarschuwing"
msgid "Jan"
msgstr "jan"
msgid "Feb"
msgstr "feb"
msgid "Mar"
msgstr "mrt"
msgid "Apr"
msgstr "apr"
msgid "May"
msgstr "mei"
msgid "Jun"
msgstr "jun"
msgid "Jul"
msgstr "jul"
msgid "Aug"
msgstr "aug"
msgid "Sep"
msgstr "sep"
msgid "Oct"
msgstr "okt"
msgid "Nov"
msgstr "nov"
msgid "Dec"
msgstr "dec"
msgid "Changed setting to"
msgstr "Instellingen veranderd naar"
msgid "Mark as NSFW by default enabled"
msgstr "Altijd als gevoelig markeren (nsfw) ingeschakeld"
msgid "Mark as NSFW by default disabled"
msgstr "Altijd als gevoelig markeren (nsfw) uitgeschakeld"
msgid "Who to follow enabled"
msgstr "Wie te volgen ingeschakeld"
msgid "Who to follow disabled"
msgstr "Wie te volgen uitgeschakeld"
msgid "Changed about me setting"
msgstr "Instelling over mij veranderd"
msgid "Uploaded new avatar"
msgstr "Nieuwe avatar geüpload"
msgid "Uploaded new header"
msgstr "Nieuwe omslagfoto geüpload"
msgid "Account locked"
msgstr "Account besloten"
msgid "Account unlocked"
msgstr "Account niet besloten"
msgid "Link previews enabled"
msgstr "Voorvertoningen links ingeschakeld"
msgid "Link previews disabled"
msgstr "Voorvertoningen links uitgeschakeld"
msgid "You didn't allow notifications"
msgstr "Je hebt meldingen niet toegestaan"
msgid "Desktop notifications enabled"
msgstr "Desktopmeldingen ingeschakeld"
msgid "Desktop notifications disabled"
msgstr "Desktopmeldingen uitgeschakeld"
msgid "Replies shown"
msgstr "Reacties getoond"
msgid "Replies hidden"
msgstr "Reacties verborgen"
msgid "CW content shown"
msgstr "Tekstwaarschuwingen (cw) getoond"
msgid "CW content hidden"
msgstr "Tekstwaarschuwingen (cw) verborgen"
msgid "NSFW content shown"
msgstr "Gevoelige inhoud (nsfw) getoond"
msgid "NSFW content hidden"
msgstr "Gevoelige inhoud (nsfw) verborgen"
msgid "Reply to"
msgstr "Reageer op"
msgid "Report"
msgstr "Rapportage"
msgid "Report a Toot of"
msgstr "Rapporteer een toot van"
msgid "What's happening?"
msgstr "Wat houdt je bezig?"
msgid "Toot"
msgstr "Toot"
msgid "Compose new Toot"
msgstr "Nieuwe toot opstellen"
msgid "Please describe what the problem with the Toot is."
msgstr "Omschrijf wat er mis is met deze Toot?"
msgid "TOOTS"
msgstr "TOOTS"
msgid "PEOPLE"
msgstr "MENSEN"
msgid "Settings"
msgstr "Instellingen"
msgid "GENERAL"
msgstr "ALGEMEEN"
msgid "PROFILE"
msgstr "PROFIEL"
msgid "APPEARANCE"
msgstr "UITERLIJK"
msgid "Change instance"
msgstr "Server veranderen"
msgid "Blank for default"
msgstr "Leeg voor de standaardwaarde"
msgid "FOLLOWING"
msgstr "VOLGEND"
msgid "Interesting accounts of devs"
msgstr "Interessante accounts van softwareontwikkelaars"
msgid "Halcyon for"
msgstr "Halcyon voor"
msgid "About"
msgstr "Over"
msgid "Terms"
msgstr "Voorwaarden"
msgid "Apps"
msgstr "Apps"
msgid "Source code"
msgstr "Broncode"
msgid "Other instances"
msgstr "Andere servers"
msgid "Privacy policy"
msgstr "Privacybeleid"
msgid "Version"
msgstr "Versie"
msgid "Who to follow"
msgstr "Wie te volgen"
msgid "Enable who to follow"
msgstr "Wie te volgen inschakelen"
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 moet met een externe server verbinden om een lijst met gebruikers op "
"te halen die gelijksoortige interesses hebben als jij. Geef hiervoor "
"toestemming wanneer je deze functie wilt gebruiken."
msgid "MORE"
msgstr "MEER"
msgid "FOLLOWERS"
msgstr "VOLGERS"
msgid "Following"
msgstr "Volgend"
msgid "You'll no longer receive notifications from this user"
msgstr "Je ontvangt niet langer meldingen van deze gebruiker"
msgid "Unmuted this user"
msgstr "Deze gebruiker niet langer negeren"
msgid "This user has been blocked"
msgstr "Deze gebruiker is geblokkeerd"
msgid "Unblocked this user"
msgstr "Deze gebruiker is deblokkeerd"
msgid "Your Toot has been deleted"
msgstr "Jouw toot is verwijderd"
msgid "Your Toot has been pinned"
msgstr "Jouw toot is vastgezet"
msgid "Your Toot has been unpinned"
msgstr "Jouw toot is losgemaakt"
msgid "Edit profile"
msgstr "Profiel bewerken"
msgid "FAVOURITES"
msgstr "FAVORIETEN"
msgid "Show"
msgstr "Tonen"
msgid "Blocking"
msgstr "Blokkeren"
msgid "Muting"
msgstr "Negeren"
msgid "Requested"
msgstr "Aangevraagd"
msgid "Photos and toots"
msgstr "Foto's en toots"
msgid "favourited your toot"
msgstr "voegde jouw toot als favoriet toe"
msgid "boosted your toot"
msgstr "boostte jouw toot"
msgid "mentioned you"
msgstr "vermeldde jou"
msgid "Your Toot was posted!"
msgstr "Jouw toot is geplaatst!"
msgid "News"
msgstr "Nieuws"
msgid "Source"
msgstr "Broncode"
msgid "Privacy"
msgstr "Privacy"
msgid "Imprint"
msgstr "Impressum"
msgid "Contact"
msgstr "Contact"
msgid "Login"
msgstr "Inloggen"
msgid "Login to Halcyon"
msgstr "Op Halcyon inloggen"
msgid "create an account"
msgstr "Maak een account aan"
msgid "or"
msgstr "of"
msgid "I agree with the"
msgstr "I ga akkoord met"
msgid "What is Halcyon"
msgstr "Wat is Halcyon"
msgid ""
"which aims to recreate the simple and beautiful user interface of Twitter "
"while keeping all advantages of decentral networks in focus."
msgstr ""
"die als doel heeft om de eenvoudige en mooie gebruikersomgeving van Twitter "
"na te bootsen, zonder dat de voordelen van decentrale netwerken verloren "
"gaan."
msgid "Halcyon is a webclient for"
msgstr "Halcyon is een webclient voor"
msgid "Contact / Feedback"
msgstr "Contact / feedback"
msgid "Use my contact form"
msgstr "Gebruik mijn contactformulier"
msgid "Help us"
msgstr "Help ons"
msgid "Halcyon Terms of Use"
msgstr "Gebruiksovereenkomst 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 ""
"Deze gebruikersvoorwaarden zijn van toepassing voor gebruikers van de "
"webservice Halcyon voor Mastodon en Pleroma (Halcyon in het kort) gehost op"
msgid "Your Reply was posted!"
msgstr "Jouw reactie is geplaatst!"
msgid "Toot reported successfully!"
msgstr "Toot succesvol gerapporteerd"
msgid "Link successfully copied!"
msgstr "Link succesvol gekopieerd!"
msgid "Home"
msgstr "Start"
msgid "Local"
msgstr "Lokaal"
msgid "Federated"
msgstr "Globaal"
msgid "Notifications"
msgstr "Meldingen"
msgid "Search Mastodon"
msgstr "Zoek op Mastodon"
msgid "View profile"
msgstr "Profiel bekijken"
msgid "Log out"
msgstr "Uitloggen"
msgid "All"
msgstr "Alles"
msgid "new notitification"
msgstr "nieuwe melding"
msgid "Show all NSFW content"
msgstr "Alle gevoelige inhoud (nsfw) tonen"
msgid "Show all CW content"
msgstr "Alle tekstwaarschuwingen (cw) uitklappen"
msgid "Show replies"
msgstr "Reacties tonen"
msgid "Desktop notifications"
msgstr "Desktopmeldingen"
msgid "Enable link previews"
msgstr "Voorvertoningen links inschakelen"
msgid "Auto update"
msgstr "Automatisch bijwerken"
msgid "Manual update"
msgstr "Handmatig bijwerken"
msgid "Appearance settings"
msgstr "Instellingen voor het uiterlijk"
msgid "New posts streaming"
msgstr "Streaming nieuwe toots"
msgid "replies"
msgstr "reacties"
msgid "General settings"
msgstr "Algemene instellingen"
msgid "Default post privacy"
msgstr "Standaardzichtbaarheid toots"
msgid "Mark as NSFW by default"
msgstr "Altijd als gevoelig (nsfw) markeren"
msgid "Media"
msgstr "Media"
msgid "FOLLOWS YOU"
msgstr "VOLGT JOU"
msgid "Local instance"
msgstr "Lokale server"
msgid "Hashtag search filter"
msgstr "Hashtagzoekfilter"
msgid "All instances"
msgstr "Alle servers"
msgid "Local only"
msgstr "Alleen lokaal"
msgid "Lock account"
msgstr "Maak account besloten"
msgid "Header"
msgstr "Omslagfoto"
msgid "Avatar"
msgstr "Avatar"
msgid "About me"
msgstr "Over mij"
msgid "Display name"
msgstr "Weergavenaam"
msgid "Profile settings"
msgstr "Profielinstellingen"
msgid "Toots"
msgstr "Toots"
msgid "Favourites"
msgstr "Favorieten"
msgid "New favourite"
msgstr "Nieuwe favoriet"
msgid "New boost"
msgstr "Nieuwe boost"
msgid "New follower"
msgstr "Nieuwe volger"
msgid "New mention"
msgstr "Nieuwe vermelding"
msgid "Dark theme enabled"
msgstr "Donker thema ingeschakeld"
msgid "Dark theme disabled"
msgstr "Donker thema uitgeschakeld"
msgid "Only on top"
msgstr "Alleen bovenaan"
msgid "Enable dark theme"
msgstr "Donker thema inschakelen"
msgid "Please enter the new name for this list."
msgstr "Vul een nieuwe naam in voor deze lijst"
msgid "The name of your list can't be empty!"
msgstr "De naam van jouw lijst kan niet leeg blijven!"
msgid "Your list has been renamed"
msgstr "Jouw lijst is hernoemd"
msgid "Are you sure that you want to delete this list?"
msgstr "Weet je zeker dat je deze lijst wilt verwijderen?"
msgid "Your list has been deleted"
msgstr "Jouw lijst is verwijderd"
msgid "Please enter the name of your new list."
msgstr "Vul een naam in voor jouw nieuwe lijst"
msgid "Add"
msgstr "Toevoegen"
msgid "Remove"
msgstr "Verwijderen"
msgid "Add to list"
msgstr "Aan lijst toevoegen"
msgid "Are you sure that you want to mute this user?"
msgstr "Weet je zeker dat je deze gebruiker wilt negeren?"
msgid "Are you sure that you want to block this user?"
msgstr "Weet je zeker dat je deze gebruiker wilt blokkeren?"
msgid "Are you sure that you want to delete this toot?"
msgstr "Weet je zeker dat je deze toot wilt verwijderen?"
msgid "Added this account to the list"
msgstr "Dit account aan de lijst toegevoegd"
msgid ""
"You need to follow this user to add him/her to the list. Do you want to do "
"that now?"
msgstr ""
"Je moet deze gebruiker volgen om deze aan de lijst te kunnen toevoegen. Wil "
"je dat nu doen?"
msgid "You successfully followed this user."
msgstr "Het volgen van deze gebruiker is geslaagd."
msgid "Removed this account from the list"
msgstr "Dit account van is van de lijst verwijderd"
msgid "Joined at"
msgstr "Geregistreerd in"
msgid "Direct messages"
msgstr "Directe berichten"
msgid "Lists"
msgstr "Lijsten"
msgid "Open public profile"
msgstr "Openbaar profiel tonen"
msgid "My Lists"
msgstr "Mijn lijsten"
msgid "Confirmation"
msgstr "Bevestiging"
msgid "Yes"
msgstr "Ja"
msgid "Cancel"
msgstr "Annuleren"
# What is the context for this word? This can mean different things.
msgid "Prompt"
msgstr "Prompt"
msgid "Ok"
msgstr "OK"
msgid "Autocomplete enabled"
msgstr "Automatisch aanvullen ingeschakeld"
msgid "Autocomplete disabled"
msgstr "Automatisch aanvullen uitgeschakeld"
msgid "Changed custom profile field"
msgstr "Handmatig profielveld veranderd"
msgid "Notifications when tab is closed enabled"
msgstr "Meldingen wanneer tabblad is gesloten ingeschakeld"
msgid "Notifications when tab is closed disabled"
msgstr "Meldingen wanneer tabblad is gesloten uitgeschakeld"
msgid "Toots of bots shown"
msgstr "Toots van bots worden getoond"
msgid "Toots of bots hidden"
msgstr "Toots van bots worden verborgen"
msgid "Filter created"
msgstr "Filter aangemaakt"
msgid "Gif animations enabled"
msgstr "GIF-animaties ingeschakeld"
msgid "Gif animations disabled"
msgstr "GIF-animaties uitgeschakeld"
msgid "Video player enabled"
msgstr "Videospeler ingeschakeld"
msgid "Video player disabled"
msgstr "Videospeler uitgeschakeld"
msgid "Audio player enabled"
msgstr "Audiospeler ingeschakeld"
msgid "Audio player disabled"
msgstr "Audiospeler uitgeschakeld"
msgid "PeerTube embeds enabled"
msgstr "Embedden van PeerTubevideo's ingeschakeld"
msgid "PeerTube embeds disabled"
msgstr "Embedden van PeerTubevideo's uitgeschakeld"
msgid "YouPlay embeds enabled"
msgstr "Embedden met YouPlay ingeschakeld"
msgid "YouPlay embeds disabled"
msgstr "Embedden met YouPlay uitgeschakeld"
msgid "Invidio.us embeds enabled"
msgstr "Embedden met Invidio.us ingeschakeld"
msgid "Invidio.us embeds disabled"
msgstr "Embedden met Invidio.us uitgeschakeld"
msgid "Vimeo embeds enabled"
msgstr "Embedden van Vimeovideo's ingeschakeld"
msgid "Vimeo embeds disabled"
msgstr "Embedden van Vimeovideo's uitgeschakeld"
msgid "Thread"
msgstr "Gesprek"
msgid "Never"
msgstr "Nooit"
msgid "Don't change"
msgstr "Niet veranderen"
msgid "Filter updated"
msgstr "Filter bijgewerkt"
msgid "Are you sure that you want to delete this filter?"
msgstr "Weet je zeker dat je deze filter wilt verwijderen?"
msgid "Your filter has been deleted"
msgstr "Jouw filter is verwijderd"
msgid "Toot to"
msgstr "Toot naar"
msgid "Administrated by"
msgstr "Beheerd door"
msgid "Users"
msgstr "Gebruikers"
msgid "Connections"
msgstr "Verbindingen"
msgid "Notifications when tab closed"
msgstr "Meldingen wanneer tabblad is gesloten"
msgid "Filter settings"
msgstr "Filterinstellingen"
msgid "Show toots of bots"
msgstr "Toots van bots tonen"
msgid "Add new filter"
msgstr "Nieuw filter toevoegen"
msgid "Create a filter"
msgstr "Filter aanmaken"
msgid "Word or phrase to filter"
msgstr "Woord of zinsdeel om te filteren"
msgid "Filter in the following timelines"
msgstr "In de volgende tijdlijnen filteren"
msgid "Expires in"
msgstr "Verloopt in"
msgid "Autocomplete in compose field"
msgstr "Autoaanvullen in tekstvak voor toots"
msgid "Media settings"
msgstr "Mediainstellingen"
msgid "Play animated GIFs"
msgstr "GIF-animaties afspelen"
msgid "Enable video player"
msgstr "Videospeler inschakelen"
msgid "Enable audio player"
msgstr "Audiospeler inschakelen"
msgid "Embed PeerTube videos"
msgstr "PeerTubevideo's embedden"
msgid "Embed YouTube using YouPlay"
msgstr "YouTubevideo's met YouPlay embedden"
msgid "Embed YouTube using Invidio.us"
msgstr "YouTubevideo's met Invidio.us embedden"
msgid "Embed Vimeo using YouPlay"
msgstr "Vimeovideo's met YouPlay embedden"
msgid "Custom profile fields"
msgstr "Handmatige profielvelden"
msgid "Name"
msgstr "Naam"
msgid "Value"
msgstr "Waarde"
msgid ""
"To verify that the links in your custom fields really belong to you, you can "
"add the link below to your website. The link text can be changed to whatever "
"you want."
msgstr ""
"Om te kunnen verifiëren dat de gelinkte websites in jouw handmatige "
"profielvelden echt van jou zijn, kun je de link hieronder aan jouw website "
"toevoegen. De omschrijving van de link maakt niet uit."
msgid "Message"
msgstr "Bericht"
msgid "Filter"
msgstr "Filter"
msgid "second"
msgstr "seconde"
msgid "seconds"
msgstr "seconden"
msgid "minute"
msgstr "minuut"
msgid "minutes"
msgstr "minuten"
msgid "hour"
msgstr "uur"
msgid "hours"
msgstr "uur"
msgid "day"
msgstr "dag"
msgid "days"
msgstr "dagen"
msgid "week"
msgstr "week"
msgid "Filter posts irreversible"
msgstr "Berichten onomkeerbaar filteren"
msgid "Whole word"
msgstr "Heel woord"
msgid "FILTERS"
msgstr "FILTERS"
msgid "MEDIA"
msgstr "MEDIA"
msgid "Dark theme reset to standard"
msgstr "Donker thema uitgeschakeld"
msgid "Pictures shown in full height"
msgstr "Afbeeldingen met volledige hoogte getoond"
msgid "Pictures shown in default height"
msgstr "Afbeeldingen met standaardhoogte getoond"
msgid "Threads shown in thread view"
msgstr "Gesprekken in gespreksweergave getoond"
msgid "Threads shown in chronological order"
msgstr "Gesprekken in chronologische volgorde getoond"
msgid "Final results"
msgstr "Uiteindelijk resultaat"
msgid "votes"
msgstr "stemmen"
msgid "left"
msgstr "links"
msgid "Vote"
msgstr "Stem"
msgid "A poll you participated in has ended"
msgstr "Een poll waaraan jij hebt meegedaan is beëindigd"
msgid "Days"
msgstr "Dagen"
msgid "Hours"
msgstr "Uur"
msgid "Minutes"
msgstr "Minuten"
msgid "Multiple choice"
msgstr "Meerdere keuzes"
msgid "Poll finished"
msgstr "Poll beëindigd"
msgid ""
"If you close the overlay, your text will get deleted! Are you sure you want "
"to close it?"
msgstr ""
"Wanneer je dit tekstvenster sluit wordt jouw tekst verwijderd! Weet je zeker "
"dat je het wilt sluiten?"
msgid "Website"
msgstr "Website"
msgid "Show pictures in full height"
msgstr "Afbeeldingen in volledige hoogte tonen"
msgid "Show threads in thread view in timeline"
msgstr "Gesprekken in gespreksweergave op de tijdlijn tonen"

2
version.txt
View File

@ -1 +1 @@
2.3.0 2.3.1

15
widgets/create_status.php
View File

@ -1,13 +1,13 @@
<form id="header_status_form" name="header_status_form" class="status_form ready"> <form id="header_status_form" name="header_status_form" class="status_form ready">
<div class="status_top"> <div class="status_left icon_box">
<input class="status_spoiler invisible" name="status_spoiler" placeholder="Content warning" type="text">
</div>
<div class="status_main">
<div class="icon_box">
<img class="js_current_profile_image"> <img class="js_current_profile_image">
</div> </div>
<div class="status_top">
<input class="status_spoiler invisible" name="status_spoiler" placeholder="<?=_('Content warning')?>" data-random="43884" type="text">
</div>
<div class="status_main">
<div class="status_textarea"> <div class="status_textarea">
<textarea class="emoji_poss" name="status_textarea" placeholder="<?=_('What\'s happening?')?>"></textarea> <textarea class="emoji_poss" name="status_textarea" placeholder="<?=_('What\'s happening?')?>" data-random="14839"></textarea>
<div class="media_attachments_preview_area invisible"></div> <div class="media_attachments_preview_area invisible"></div>
<div class="status_poll_editor invisible"> <div class="status_poll_editor invisible">
<i class="fa fa-circle-o"></i> <input name="options[]" type="text" class="disallow_enter textfield poll_field" maxlength="25"><br/> <i class="fa fa-circle-o"></i> <input name="options[]" type="text" class="disallow_enter textfield poll_field" maxlength="25"><br/>
@ -72,6 +72,9 @@
<div class="submit_status_label_wrap"> <div class="submit_status_label_wrap">
<span class="character_count"> <span class="character_count">
</span> </span>
<label for="header_status_addfield" class="status_addfield status_option_button">
<i class="fa fa-plus-circle" aria-hidden="true"></i>
</label>
<label for="header_status_form_submit" class="submit_status_label"> <label for="header_status_form_submit" class="submit_status_label">
<div class="toot_button_label disallow_select" > <div class="toot_button_label disallow_select" >
<i class="fa fa-fw fa-pencil-square-o"></i> <i class="fa fa-fw fa-pencil-square-o"></i>

7
widgets/overlay_create_status.php
View File

@ -4,11 +4,11 @@
</header> </header>
<form id="overlay_status_form" name="overlay_status_form" class="status_form ready"> <form id="overlay_status_form" name="overlay_status_form" class="status_form ready">
<div class="status_top"> <div class="status_top">
<input class="status_spoiler invisible" name="status_spoiler" placeholder="<?=_('Content warning')?>" type="text"> <input class="status_spoiler invisible" name="status_spoiler" placeholder="<?=_('Content warning')?>" data-random="35366" type="text">
</div> </div>
<div class="status_main"> <div class="status_main">
<div class="status_textarea"> <div class="status_textarea">
<textarea class="emoji_poss" name="status_textarea" placeholder="What's happening?"></textarea> <textarea class="emoji_poss" name="status_textarea" placeholder="<?=('What\'s happening?')?>" data-random="30210"></textarea>
<div class="media_attachments_preview_area invisible"></div> <div class="media_attachments_preview_area invisible"></div>
<div class="status_poll_editor invisible"> <div class="status_poll_editor invisible">
<i class="fa fa-circle-o"></i> <input name="options[]" type="text" class="disallow_enter textfield poll_field" maxlength="25"><br/> <i class="fa fa-circle-o"></i> <input name="options[]" type="text" class="disallow_enter textfield poll_field" maxlength="25"><br/>
@ -73,6 +73,9 @@
<div class="submit_status_label_wrap"> <div class="submit_status_label_wrap">
<span class="character_count"> <span class="character_count">
</span> </span>
<label for="header_status_addfield" class="status_addfield status_option_button">
<i class="fa fa-plus-circle" aria-hidden="true"></i>
</label>
<label for="overlay_status_form_submit" class="submit_status_label"> <label for="overlay_status_form_submit" class="submit_status_label">
<div class="toot_button_label disallow_select"> <div class="toot_button_label disallow_select">
<i class="fa fa-fw fa-pencil-square-o"></i> <i class="fa fa-fw fa-pencil-square-o"></i>

7
widgets/overlay_single_reply.php
View File

@ -5,11 +5,11 @@
<div class="status_preview"></div> <div class="status_preview"></div>
<form id="single_reply_status_form" name="single_reply_status_form" class="status_form"> <form id="single_reply_status_form" name="single_reply_status_form" class="status_form">
<div class="status_top"> <div class="status_top">
<input class="status_spoiler invisible" name="status_spoiler" placeholder="<?=_('Content warning')?>" type="text"> <input class="status_spoiler invisible" name="status_spoiler" placeholder="<?=_('Content warning')?>" data-random="94785" type="text">
</div> </div>
<div class="status_main"> <div class="status_main">
<div class="status_textarea"> <div class="status_textarea">
<textarea class="emoji_poss" name="status_textarea" placeholder="<?=_('What\'s happening?')?>"></textarea> <textarea class="emoji_poss" name="status_textarea" placeholder="<?=_('What\'s happening?')?>" data-random="39303"></textarea>
<div class="media_attachments_preview_area invisible"></div> <div class="media_attachments_preview_area invisible"></div>
<div class="status_poll_editor invisible"> <div class="status_poll_editor invisible">
<i class="fa fa-circle-o"></i> <input name="options[]" type="text" class="disallow_enter textfield poll_field" maxlength="25"><br/> <i class="fa fa-circle-o"></i> <input name="options[]" type="text" class="disallow_enter textfield poll_field" maxlength="25"><br/>
@ -74,6 +74,9 @@
<div class="submit_status_label_wrap"> <div class="submit_status_label_wrap">
<span class="character_count"> <span class="character_count">
</span> </span>
<label for="header_status_addfield" class="status_addfield status_option_button">
<i class="fa fa-plus-circle" aria-hidden="true"></i>
</label>
<label for="single_reply_status_form_submit" class="submit_status_label"> <label for="single_reply_status_form_submit" class="submit_status_label">
<div class="toot_button_label disallow_select"> <div class="toot_button_label disallow_select">
<i class="fa fa-reply" aria-hidden="true"></i> <i class="fa fa-reply" aria-hidden="true"></i>