From b2dd50668831b153d58de46bee7d2a1a210a965f Mon Sep 17 00:00:00 2001 From: nipos Date: Tue, 7 May 2019 19:19:29 +0200 Subject: [PATCH] Add Dutch translation,allow adding more toots to editor,many bugfixes --- README.md | 1 + assets/css/dark.css | 3 + assets/css/style.css | 34 +- assets/js/halcyon/halcyonFunctions.js | 27 + assets/js/halcyon/halcyonTemplates.js | 36 +- assets/js/halcyon/halcyonUI.js | 227 +++++-- docker/locale/locale.gen | 1 + locale/de_DE/LC_MESSAGES/messages.mo | Bin 15794 -> 17351 bytes locale/de_DE/LC_MESSAGES/messages.po | 95 ++- locale/en_US/LC_MESSAGES/messages.mo | Bin 16311 -> 16169 bytes locale/en_US/LC_MESSAGES/messages.po | 101 ++- locale/nl_NL/LC_MESSAGES/messages.mo | Bin 0 -> 17312 bytes locale/nl_NL/LC_MESSAGES/messages.po | 933 ++++++++++++++++++++++++++ version.txt | 2 +- widgets/create_status.php | 15 +- widgets/overlay_create_status.php | 7 +- widgets/overlay_single_reply.php | 7 +- 17 files changed, 1373 insertions(+), 116 deletions(-) create mode 100644 locale/nl_NL/LC_MESSAGES/messages.mo create mode 100644 locale/nl_NL/LC_MESSAGES/messages.po diff --git a/README.md b/README.md index 7a5fc60..ce5bbdf 100644 --- a/README.md +++ b/README.md @@ -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 ## 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) - [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 diff --git a/assets/css/dark.css b/assets/css/dark.css index 80a3fda..6aad959 100644 --- a/assets/css/dark.css +++ b/assets/css/dark.css @@ -38,6 +38,9 @@ background-color:#132030; background-color: #132030; 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 .status_poll_editor { background-color:#1B2836; diff --git a/assets/css/style.css b/assets/css/style.css index 9712557..024ef2f 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -139,17 +139,17 @@ cursor: default; .status_form .status_top { display: flex; align-items: center; -width: calc( 100% - 54px ); padding-bottom: 0; -margin-left: 54px; box-sizing: border-box; } .status_form .status_top .status_spoiler { -color: #189EFC; +color: #000; width: 100%; height: 35px; -border-radius: 4px; +border-top-left-radius:4px; +border-top-right-radius:4px; border: 1px solid #C7E7FB; +border-bottom:0 !important; font-size: 14px; padding: 8px; box-sizing: border-box; @@ -157,8 +157,9 @@ box-sizing: border-box; .status_form .status_main { display: flex; flex-wrap: nowrap; +width:100%; } -.status_form .status_main .icon_box { +#autoCompleteDropDown .icon_box { flex-shrink: 0; margin-right: 8px; width: 32px; @@ -167,14 +168,32 @@ border-radius: 5px; overflow: hidden; 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 { flex: 1; padding: 8px; -border-radius: 3px; +border-radius:3px; box-sizing: border-box; border: 1px solid #C7E7FB; 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 { color: #000; resize: none; @@ -187,6 +206,9 @@ line-height: normal; outline: 0; overflow: hidden; } +.status_form .status_textarea textarea:not(:last-of-type) { +border-bottom:1px solid #C7E7FB; +} .status_form .status_textarea textarea.focus { height: 68px; } diff --git a/assets/js/halcyon/halcyonFunctions.js b/assets/js/halcyon/halcyonFunctions.js index 1724465..7b99215 100644 --- a/assets/js/halcyon/halcyonFunctions.js +++ b/assets/js/halcyon/halcyonFunctions.js @@ -566,3 +566,30 @@ 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); +} +}); +} diff --git a/assets/js/halcyon/halcyonTemplates.js b/assets/js/halcyon/halcyonTemplates.js index eb90602..4f7bf29 100644 --- a/assets/js/halcyon/halcyonTemplates.js +++ b/assets/js/halcyon/halcyonTemplates.js @@ -378,7 +378,7 @@ var account_state_icons = ""; if(status.reblog.account.locked == true) account_state_icons += " "; if(status.reblog.account.bot == true) account_state_icons += " "; const html = $(` -
  • +
  • ${status.account.display_name} ${__('Boosted')} @@ -1056,7 +1056,7 @@ html.find(".toot_article").append(poll_object); return html } else if(NotificationObj.type === 'follow') { const html=(` -
  • +
  • @@ -1277,17 +1277,16 @@ ${toot_reblog_button}
    +
    + +
    - +
    - -
    - -
    - + +
    + +
    - +
    - -
    - -
    - +