liquid_feedback_frontend
changeset 1790:20c1c8cc28ba
Splitted different meanings of rejected, specified context of accepted and invited
line diff
1.1 --- a/app/main/initiative/_sidebar_state.lua Wed Oct 20 15:47:25 2021 +0200 1.2 +++ b/app/main/initiative/_sidebar_state.lua Wed Oct 20 15:48:51 2021 +0200 1.3 @@ -23,7 +23,7 @@ 1.4 elseif initiative.rank then 1.5 head_text = _("Rejected (rank #{rank})", { rank = initiative.rank }) 1.6 else 1.7 - head_text = _"Rejected" 1.8 + head_text = _"Rejected [initiative]" 1.9 end 1.10 1.11 ui.heading { level = 1, content = head_text }
2.1 --- a/app/main/member/_show_thumb.lua Wed Oct 20 15:47:25 2021 +0200 2.2 +++ b/app/main/member/_show_thumb.lua Wed Oct 20 15:48:51 2021 +0200 2.3 @@ -128,9 +128,9 @@ 2.4 2.5 if initiator and initiator.accepted then 2.6 if member.accepted == nil then 2.7 - slot.put(_"Invited") 2.8 + slot.put(_"Invited [as initiator]") 2.9 elseif member.accepted == false then 2.10 - slot.put(_"Rejected") 2.11 + slot.put(_"Rejected [initiator invitation]") 2.12 end 2.13 end 2.14
3.1 --- a/app/main/member/settings_agent.lua Wed Oct 20 15:47:25 2021 +0200 3.2 +++ b/app/main/member/settings_agent.lua Wed Oct 20 15:48:51 2021 +0200 3.3 @@ -32,9 +32,9 @@ 3.4 content = function(record) 3.5 local text 3.6 if record.accepted then 3.7 - text = _"accepted" 3.8 + text = _"accepted [account access]" 3.9 elseif record.accepted == false then 3.10 - text = _"rejected" 3.11 + text = _"rejected [account access]" 3.12 else 3.13 text = _"not decided yet" 3.14 end
4.1 --- a/locale/translations.en.lua Wed Oct 20 15:47:25 2021 +0200 4.2 +++ b/locale/translations.en.lua Wed Oct 20 15:48:51 2021 +0200 4.3 @@ -340,7 +340,7 @@ 4.4 ["Invite code"] = false; 4.5 ["Invite letter"] = "Invitation letter"; 4.6 ["Invite member"] = false; 4.7 -["Invited"] = false; 4.8 +["Invited [as initiator]"] = false; 4.9 ["Issue #"] = false; 4.10 ["Issue ##{id}"] = false; 4.11 ["Issue ##{issue_id}: #{initiative_name}"] = false; 4.12 @@ -533,7 +533,8 @@ 4.13 ["Registration rejected"] = false; 4.14 ["Registration succeeded"] = "Registration successful"; 4.15 ["Reject access privilege"] = false; 4.16 -["Rejected"] = false; 4.17 +["Rejected [initiator invitation]"] = "Rejected"; 4.18 +["Rejected [initiative]"] = "Rejected"; 4.19 ["Rejected (#{count})"] = false; 4.20 ["Rejected (rank #{rank})"] = false; 4.21 ["Rejected accreditation requests"] = false; 4.22 @@ -798,7 +799,7 @@ 4.23 ["[not displayed public]"] = false; 4.24 ["abandoned"] = false; 4.25 ["accept invitation"] = false; 4.26 -["accepted"] = false; 4.27 +["accepted [account access]"] = "accepted"; 4.28 ["account activated"] = false; 4.29 ["action"] = false; 4.30 ["activate account"] = false; 4.31 @@ -974,7 +975,7 @@ 4.32 ["reached #{quorum}"] = false; 4.33 ["refresh my support"] = false; 4.34 ["refuse invitation"] = false; 4.35 -["rejected"] = false; 4.36 +["rejected [account access]"] = "rejected"; 4.37 ["remove an initiator"] = false; 4.38 ["remove from my contact list"] = false; 4.39 ["remove my interest"] = "Remove my interest";
5.1 --- a/locale/translations.eo.lua Wed Oct 20 15:47:25 2021 +0200 5.2 +++ b/locale/translations.eo.lua Wed Oct 20 15:48:51 2021 +0200 5.3 @@ -338,7 +338,7 @@ 5.4 ["Invite an initiator to initiative"] = "Inviti inicionton al la iniciato"; 5.5 ["Invite code"] = "Invitokodo"; 5.6 ["Invite member"] = false; 5.7 -["Invited"] = "Invitita"; 5.8 +["Invited [as initiator]"] = "Invitita"; 5.9 ["Issue #"] = false; 5.10 ["Issue ##{id}"] = "Temo ##{id}"; 5.11 ["Issue ##{issue_id}: #{initiative_name}"] = false;
6.1 --- a/locale/translations.es.lua Wed Oct 20 15:47:25 2021 +0200 6.2 +++ b/locale/translations.es.lua Wed Oct 20 15:48:51 2021 +0200 6.3 @@ -533,7 +533,8 @@ 6.4 ["Registration rejected"] = "Registro rechazado"; 6.5 ["Registration succeeded"] = "Registro exitoso"; 6.6 ["Reject access privilege"] = "Rechazar privilegio de acceso"; 6.7 -["Rejected"] = "Rechazado"; 6.8 +["Rejected [initiator invitation"] = "Rechazado"; 6.9 +["Rejected [initiative]"] = "Rechazado"; 6.10 ["Rejected (#{count})"] = "Rechazado (#{count})"; 6.11 ["Rejected (rank #{rank})"] = "Rechazado (rank #{rank})"; 6.12 ["Rejected accreditation requests"] = "Solicitudes de acreditación rechazadas"; 6.13 @@ -798,7 +799,7 @@ 6.14 ["[not displayed public]"] = "[no se muestra públicamente]"; 6.15 ["abandoned"] = "abandonado"; 6.16 ["accept invitation"] = "aceptar invitación"; 6.17 -["accepted"] = "aceptada"; 6.18 +["accepted [account access]"] = "aceptada"; 6.19 ["account activated"] = "cuenta activada"; 6.20 ["action"] = "acción"; 6.21 ["activate account"] = "activar cuenta"; 6.22 @@ -973,7 +974,7 @@ 6.23 ["reached #{quorum}"] = "alcanzó #{quorum}"; 6.24 ["refresh my support"] = "renovar mi apoyo"; 6.25 ["refuse invitation"] = "rechazar la invitación"; 6.26 -["rejected"] = "rechazado"; 6.27 +["rejected [account access]"] = "rechazado"; 6.28 ["remove an initiator"] = "Eliminar un iniciador"; 6.29 ["remove from my contact list"] = "eliminar de mi lista de contactos"; 6.30 ["remove my interest"] = "Eliminar mi interés";
7.1 --- a/locale/translations.fr.lua Wed Oct 20 15:47:25 2021 +0200 7.2 +++ b/locale/translations.fr.lua Wed Oct 20 15:48:51 2021 +0200 7.3 @@ -355,7 +355,7 @@ 7.4 ["Invite code"] = "Code d'invitation"; 7.5 ["Invite letter"] = false; 7.6 ["Invite member"] = "Inviter un membre"; 7.7 -["Invited"] = "Invité"; 7.8 +["Invited [as initiator]"] = "Invité"; 7.9 ["Issue #"] = "Thématique #"; 7.10 ["Issue ##{id}"] = "Thématique ##{id}"; 7.11 ["Issue ##{issue_id}: #{initiative_name}"] = "Thématique ##{issue_id}: #{initiative_name}"; 7.12 @@ -566,7 +566,8 @@ 7.13 ["Registration rejected"] = false; 7.14 ["Registration succeeded"] = false; 7.15 ["Reject access privilege"] = false; 7.16 -["Rejected"] = "Rejeté"; 7.17 +["Rejected [initiator invitation]"] = "Rejeté"; 7.18 +["Rejected [initiative]"] = "Rejeté"; 7.19 ["Rejected (#{count})"] = false; 7.20 ["Rejected (rank #{rank})"] = "Rejeté (position #{rank})"; 7.21 ["Rejected accreditation requests"] = false; 7.22 @@ -843,7 +844,7 @@ 7.23 ["[not displayed public]"] = "[affichage non public]"; 7.24 ["abandoned"] = "abandonné"; 7.25 ["accept invitation"] = "accepter l'invitation"; 7.26 -["accepted"] = false; 7.27 +["accepted [account access]"] = false; 7.28 ["account activated"] = false; 7.29 ["action"] = "action"; 7.30 ["activate account"] = "activer le compte"; 7.31 @@ -1024,7 +1025,7 @@ 7.32 ["reached #{quorum}"] = "atteint"; 7.33 ["refresh my support"] = "rénover mon soutien"; 7.34 ["refuse invitation"] = "réfuser l'invitation"; 7.35 -["rejected"] = false; 7.36 +["rejected [account access]"] = false; 7.37 ["remove an initiator"] = "retirer un promoteur"; 7.38 ["remove from my contact list"] = "retirer de ma liste des contacts"; 7.39 ["remove my interest"] = "retirer mon intérêt";
8.1 --- a/locale/translations.hu.lua Wed Oct 20 15:47:25 2021 +0200 8.2 +++ b/locale/translations.hu.lua Wed Oct 20 15:48:51 2021 +0200 8.3 @@ -338,7 +338,7 @@ 8.4 ["Invite an initiator to initiative"] = "Kezdeményezõ meghívása a kezdeményezéshez"; 8.5 ["Invite code"] = "Meghívókód"; 8.6 ["Invite member"] = false; 8.7 -["Invited"] = "Meghívva"; 8.8 +["Invited [as initiator]"] = "Meghívva"; 8.9 ["Issue #"] = false; 8.10 ["Issue ##{id}"] = "Téma: ##{id}"; 8.11 ["Issue ##{issue_id}: #{initiative_name}"] = false; 8.12 @@ -514,7 +514,8 @@ 8.13 ["Registration (step 1 of 3: Invite code)"] = false; 8.14 ["Registration (step 2 of 3: Personal information)"] = false; 8.15 ["Registration (step 3 of 3: Terms of use and password)"] = false; 8.16 -["Rejected"] = "Elutasítva"; 8.17 +["Rejected [initiator invitation]"] = "Elutasítva"; 8.18 +["Rejected [initiative]"] = "Elutasítva"; 8.19 ["Rejected (rank #{rank})"] = false; 8.20 ["Remove"] = "Eltávolítás"; 8.21 ["Remove an initiator from initiative"] = false;
9.1 --- a/locale/translations.it.lua Wed Oct 20 15:47:25 2021 +0200 9.2 +++ b/locale/translations.it.lua Wed Oct 20 15:48:51 2021 +0200 9.3 @@ -370,7 +370,7 @@ 9.4 ["Invite code"] = "Codice di invito"; 9.5 ["Invite letter"] = false; 9.6 ["Invite member"] = "Invita utente"; 9.7 -["Invited"] = "Invitato"; 9.8 +["Invited [as initiator]"] = "Invitato"; 9.9 ["Issue #"] = "Tematica #"; 9.10 ["Issue ##{id}"] = "Tematica ##{id}"; 9.11 ["Issue ##{issue_id}: #{initiative_name}"] = "Tematica ##{issue_id}: #{initiative_name}"; 9.12 @@ -586,7 +586,8 @@ 9.13 ["Registration rejected"] = false; 9.14 ["Registration succeeded"] = false; 9.15 ["Reject access privilege"] = false; 9.16 -["Rejected"] = "Rifiutato"; 9.17 +["Rejected [initiator invitation]"] = "Rifiutato"; 9.18 +["Rejected [initiative]"] = "Rifiutato"; 9.19 ["Rejected (#{count})"] = false; 9.20 ["Rejected (rank #{rank})"] = "Rifiutata (posizione #{rank})"; 9.21 ["Rejected accreditation requests"] = false; 9.22 @@ -878,7 +879,7 @@ 9.23 ["[not displayed public]"] = "[non visibile pubblicamente]"; 9.24 ["abandoned"] = "abbandonato"; 9.25 ["accept invitation"] = "accetta invito"; 9.26 -["accepted"] = false; 9.27 +["accepted [account access]"] = false; 9.28 ["account activated"] = false; 9.29 ["action"] = "azione"; 9.30 ["activate account"] = "attiva account"; 9.31 @@ -1058,7 +1059,7 @@ 9.32 ["reached #{quorum}"] = "raggiunto "; 9.33 ["refresh my support"] = "rinnova il mio supporto"; 9.34 ["refuse invitation"] = "rifiuta l'invito"; 9.35 -["rejected"] = false; 9.36 +["rejected [account access]"] = false; 9.37 ["remove an initiator"] = "rimuovi un promotore"; 9.38 ["remove from my contact list"] = "rimuovi dalla lista dei contatti"; 9.39 ["remove my interest"] = "togli il mio interesse";
10.1 --- a/locale/translations.ka.lua Wed Oct 20 15:47:25 2021 +0200 10.2 +++ b/locale/translations.ka.lua Wed Oct 20 15:48:51 2021 +0200 10.3 @@ -338,7 +338,7 @@ 10.4 ["Invite an initiator to initiative"] = "მოიწვიეთ ინიციატორი ინიციატივაზე"; 10.5 ["Invite code"] = "მოწვევის კოდი"; 10.6 ["Invite member"] = "მოიწვიეთ წევრი"; 10.7 -["Invited"] = "მოწვეულია"; 10.8 +["Invited [as initiator]"] = "მოწვეულია"; 10.9 ["Issue #"] = "საკითხი #"; 10.10 ["Issue ##{id}"] = "საკითხი ##{id}"; 10.11 ["Issue ##{issue_id}: #{initiative_name}"] = "საკითხი ##{issue_id}: #{initiative_name}"; 10.12 @@ -514,7 +514,8 @@ 10.13 ["Registration (step 1 of 3: Invite code)"] = "რეგისტრაცია (3-დან 1 საფეხური: მოწვევის კოდი)"; 10.14 ["Registration (step 2 of 3: Personal information)"] = "რეგისტრაცია (3-დან 2 საფეხური: პერსონალური ინფორმაცია)"; 10.15 ["Registration (step 3 of 3: Terms of use and password)"] = "რეგისტრაცია (3-დან 3 საფეხური: მოხმარების პირობები და პაროლი)"; 10.16 -["Rejected"] = "უარყოფილია"; 10.17 +["Rejected [initiator invitation]"] = "უარყოფილია"; 10.18 +["Rejected [initiative]"] = "უარყოფილია"; 10.19 ["Rejected (rank #{rank})"] = "უარყოფილია (rank #{rank})"; 10.20 ["Remove"] = "მოხსნა"; 10.21 ["Remove an initiator from initiative"] = "ინიციატორის ინიციატივიდან მოხსნა";
11.1 --- a/locale/translations.nl.lua Wed Oct 20 15:47:25 2021 +0200 11.2 +++ b/locale/translations.nl.lua Wed Oct 20 15:48:51 2021 +0200 11.3 @@ -338,7 +338,7 @@ 11.4 ["Invite an initiator to initiative"] = "Nodig een initiatiefnemer bij een initiatief uit"; 11.5 ["Invite code"] = "Invite-Code"; 11.6 ["Invite member"] = false; 11.7 -["Invited"] = "Uitgenodigd"; 11.8 +["Invited [as initiator]"] = "Uitgenodigd"; 11.9 ["Issue #"] = false; 11.10 ["Issue ##{id}"] = "Onderwerp ##{id}"; 11.11 ["Issue ##{issue_id}: #{initiative_name}"] = false; 11.12 @@ -514,7 +514,8 @@ 11.13 ["Registration (step 1 of 3: Invite code)"] = "Registratie (stap 1 van 3: uitnodigingscode)"; 11.14 ["Registration (step 2 of 3: Personal information)"] = "Registratie (stap 1 van 3: persoonlijke informatie)"; 11.15 ["Registration (step 3 of 3: Terms of use and password)"] = "Registratie (stap 1 van 3: gebruikershandleiding en wachtwoord)"; 11.16 -["Rejected"] = "Verworpen"; 11.17 +["Rejected [initiative]"] = "Verworpen"; 11.18 +["Rejected [initiator invitation]"] = "Verworpen"; 11.19 ["Rejected (rank #{rank})"] = false; 11.20 ["Remove"] = "Verwijderen"; 11.21 ["Remove an initiator from initiative"] = false;
12.1 --- a/locale/translations.zh-Hans.lua Wed Oct 20 15:47:25 2021 +0200 12.2 +++ b/locale/translations.zh-Hans.lua Wed Oct 20 15:48:51 2021 +0200 12.3 @@ -338,7 +338,7 @@ 12.4 ["Invite an initiator to initiative"] = "邀请发起者来提案"; 12.5 ["Invite code"] = "邀请码"; 12.6 ["Invite member"] = false; 12.7 -["Invited"] = "已被邀请"; 12.8 +["Invited [as initiator]"] = "已被邀请"; 12.9 ["Issue #"] = false; 12.10 ["Issue ##{id}"] = "议题 ##{id}"; 12.11 ["Issue ##{issue_id}: #{initiative_name}"] = false; 12.12 @@ -514,7 +514,8 @@ 12.13 ["Registration (step 1 of 3: Invite code)"] = "注册 (三步骤之一：邀请码)"; 12.14 ["Registration (step 2 of 3: Personal information)"] = "注册 (三步骤之二：个人资料)"; 12.15 ["Registration (step 3 of 3: Terms of use and password)"] = "注册 (三步骤之三：使用条款及密码)"; 12.16 -["Rejected"] = "被婉拒"; 12.17 +["Rejected [initiator invitation]"] = "被婉拒"; 12.18 +["Rejected [initiative]"] = "被婉拒"; 12.19 ["Rejected (rank #{rank})"] = false; 12.20 ["Remove"] = "移除"; 12.21 ["Remove an initiator from initiative"] = false;
13.1 --- a/locale/translations.zh-TW.lua Wed Oct 20 15:47:25 2021 +0200 13.2 +++ b/locale/translations.zh-TW.lua Wed Oct 20 15:48:51 2021 +0200 13.3 @@ -338,7 +338,7 @@ 13.4 ["Invite an initiator to initiative"] = "邀請發起者來提案"; 13.5 ["Invite code"] = "邀請碼"; 13.6 ["Invite member"] = false; 13.7 -["Invited"] = "已被邀請"; 13.8 +["Invited [as initiator]"] = "已被邀請"; 13.9 ["Issue #"] = false; 13.10 ["Issue ##{id}"] = "議題 ##{id}"; 13.11 ["Issue ##{issue_id}: #{initiative_name}"] = false; 13.12 @@ -514,7 +514,8 @@ 13.13 ["Registration (step 1 of 3: Invite code)"] = "註冊 (三步驟之一：邀請碼)"; 13.14 ["Registration (step 2 of 3: Personal information)"] = "註冊 (三步驟之二：個人資料)"; 13.15 ["Registration (step 3 of 3: Terms of use and password)"] = "註冊 (三步驟之三：使用條款及密碼)"; 13.16 -["Rejected"] = "被婉拒"; 13.17 +["Rejected [initiator invitation]"] = "被婉拒"; 13.18 +["Rejected [initiative]"] = "被婉拒"; 13.19 ["Rejected (rank #{rank})"] = false; 13.20 ["Remove"] = "移除"; 13.21 ["Remove an initiator from initiative"] = false;