From abdf6f40a2712e31fe97d1d059bfea57a78be257 Mon Sep 17 00:00:00 2001 From: Hilmar R Date: Sat, 23 Jan 2021 00:08:25 +0100 Subject: at end of day, some files probably without conflicts so far --- doc/admin/zarlog_msgs.md | 112 +++++++++++++++++++++ .../default_profile_photos/human_confusion/300.png | Bin 0 -> 36281 bytes .../default_profile_photos/human_confusion/48.png | Bin 0 -> 1740 bytes .../default_profile_photos/human_confusion/80.png | Bin 0 -> 4054 bytes images/zapax16.gif | Bin 0 -> 826 bytes include/channel.php | 4 +- view/de-de/invite.casual.subject.tpl | 1 + view/de-de/invite.casual.tpl | 15 +++ view/de-de/invite.formal.subject.tpl | 1 + view/de-de/invite.formal.tpl | 19 ++++ view/en/invite.casual.subject.tpl | 1 + view/en/invite.casual.tpl | 16 +++ view/en/invite.formal.subject.tpl | 1 + view/en/invite.formal.tpl | 32 ++++++ view/en/invite.material.subject.tpl | 1 + view/en/invite.material.tpl | 1 + view/en/register_verify_member.tpl | 8 +- view/es-es/invite.casual.subject.tpl | 1 + view/es-es/invite.casual.tpl | 14 +++ view/es-es/invite.formal.subject.tpl | 1 + view/es-es/invite.formal.tpl | 19 ++++ 21 files changed, 243 insertions(+), 4 deletions(-) create mode 100644 doc/admin/zarlog_msgs.md create mode 100644 images/default_profile_photos/human_confusion/300.png create mode 100644 images/default_profile_photos/human_confusion/48.png create mode 100644 images/default_profile_photos/human_confusion/80.png create mode 100644 images/zapax16.gif create mode 100644 view/de-de/invite.casual.subject.tpl create mode 100644 view/de-de/invite.casual.tpl create mode 100644 view/de-de/invite.formal.subject.tpl create mode 100644 view/de-de/invite.formal.tpl create mode 100644 view/en/invite.casual.subject.tpl create mode 100644 view/en/invite.casual.tpl create mode 100644 view/en/invite.formal.subject.tpl create mode 100644 view/en/invite.formal.tpl create mode 100644 view/en/invite.material.subject.tpl create mode 100644 view/en/invite.material.tpl create mode 100644 view/es-es/invite.casual.subject.tpl create mode 100644 view/es-es/invite.casual.tpl create mode 100644 view/es-es/invite.formal.subject.tpl create mode 100644 view/es-es/invite.formal.tpl diff --git a/doc/admin/zarlog_msgs.md b/doc/admin/zarlog_msgs.md new file mode 100644 index 000000000..0fe16a1e2 --- /dev/null +++ b/doc/admin/zarlog_msgs.md @@ -0,0 +1,112 @@ +~~~ +L regate ZAR1131E dId2 mistaken +L ZAR1132E Identity unknown + ZAR1133A Sorry for any inconvience. Thank you for your response. +L ZAR1134S email verfication denied {did2} +L ZAR1135E not awaited url parameter received + +L regate ZAR1230S Unexpected registration verification request for +L ZAR1231E dId2 mistaken +L ZAR1232E Identity unknown +L ZAR1234W Request not inside time frame +L ZAR1235E Token verification failed + ZAR1236I Verify successfull +L ZAR1236E Verify failed +L ZAR1237D unexpected + (reason may be caused by new account flags implemented still not known) + ZAR1238I Email resent + ZAR1238E Resent failed +L ZAR1239I Account successfull created +L ZAR1239E Account creation error + + register ZAR0130E Registration on this hub is disabled. + ZAR0131I Registration on this hub is by approval only. + Register at another affiliated hub in case when prefered + ZAR0132I Registration on this hub is by invitation only. + Register at another affiliated hub + ZAR0133I If the registation was already submitted with your data once ago, + enter your identity (like email) here and submit + ZAR0134I I have an invite code + ZAR0135I This site requires verification. After completing this form, + please check the notice or your email for further instructions. + ZAR0136I Your email address (or leave blank to register without email) + +L register ZAR0230S Unexpected registration request + ZAR0231E Email address mistake + ZAR0231E Passwords do not match. + ZAR0231E Please indicate acceptance of the Terms of Service. Registration failed. + ZAR0232E Invitations are not available +L ZAR0233E Registration on this hub is by invitation only +L ZAR0234S Invitation code failed +L ZAR0235S Invitation email failed + ZAR0236E Invitation not in time or too late + ZAR0237I Invitation code succesfully applied +L ZAR0238E Email address already in use +L ZAR0239D Error creating dId A + ZAR0239I Your didital id is {did2} and your pin for is {pin} + Keep these infos and your entered password safe + Valid from ... nd expire ... +L ZAR0239S Exceeding same ip register request of + + ui:admin:site + ZAR0810C Register text + Will be displayed prominently on the registration page. + ZAR0820C register_policy + Does this site allow new member registration? + ZAR0830C Registration office on duty + The weekdays and hours the register office is open for registrations + ZAR0831I Testmode duties + (interactive) + ZAR0840C Account registrations max per day + How many registration requests the site accepts during one day. Unlimited if zero or no value. + ZAR0850C Account registrations from same ip + How many pending registration requests the site accepts from a same ip address. + ZAR0860C Account registration delay + How long a registration request has to wait before validation can perform + ZAR0862C Account registration expiration + How long a registration to confirm remains valid. Not expire if zero or no value + ZAR0870C Auto channel create + Auto create a channel when register a new account. When On, the register form will show + additional fields for the channel-name and the nickname. + ZAR0880C Invitation only + Only allow new member registrations with an invitation code. + Above register policy must be set to Yes. + ZAR0881C Invitation also + Also allow new member registrations with an invitation code. + Above register policy must be set to Yes. + ZAR0890C Verify Email Addresses + Check to verify email addresses used in account registration (recommended). + + invite ZAI0100E All users invitation limit exceeded + ZAI0101E Permission denied. + ZAI0102E Invite App (Not Installed) + ZAI0103E Invites not proposed by configuration. Contact the site admin + ZAI0104E Invites by users not enabled + ZAI0105W You have no more invitations available + ZAI0106I Invitations I am using + ZAI0107I Invitations we are using + ZAI0109E Not on xchan + ZAI0110I § Note, the email(s) sent will be recorded in the system logs + (see ZAI0208I @ L) + ZAI0111I Enter email addresses, one per line + ZAI0112I Your message + Here you may enter personal notes to the recipient(s) + ZAI0113I Invite template + ZAI0114I Note, the invitation code is valid up to ... + + invite ZAI0201E Permission denied. + ZAI0202E Invite App (Not Installed) + ZAI0203E Not a valid email address + ZAI0204E Not a real email address + ZAI0205E Not allowed email address + ZAI0206E mail address already in use + ZAI0207I Note, the invitation code is valid up to + ZAI0208E Message delivery failed. + ZAI0208I Message delivery success. +L ZAI0208I to {email} Message delivery success. ({account#}, {channel#}, from:{email}}) + ZAI0209I Accepted email address + ZAI0210E Too many recipients for one invitation (max n) + ZAI0211E No recipients for this invitation + ZAI0212I n mail(s) sent, n mail error(s) + ZAI0213E Register is closed +~~~ diff --git a/images/default_profile_photos/human_confusion/300.png b/images/default_profile_photos/human_confusion/300.png new file mode 100644 index 000000000..3f21ae68f Binary files /dev/null and b/images/default_profile_photos/human_confusion/300.png differ diff --git a/images/default_profile_photos/human_confusion/48.png b/images/default_profile_photos/human_confusion/48.png new file mode 100644 index 000000000..5013a0aef Binary files /dev/null and b/images/default_profile_photos/human_confusion/48.png differ diff --git a/images/default_profile_photos/human_confusion/80.png b/images/default_profile_photos/human_confusion/80.png new file mode 100644 index 000000000..5a32ab45f Binary files /dev/null and b/images/default_profile_photos/human_confusion/80.png differ diff --git a/images/zapax16.gif b/images/zapax16.gif new file mode 100644 index 000000000..81468ad35 Binary files /dev/null and b/images/zapax16.gif differ diff --git a/include/channel.php b/include/channel.php index 2d79cd074..f2e7a703c 100644 --- a/include/channel.php +++ b/include/channel.php @@ -2021,7 +2021,7 @@ function get_theme_uid() { function get_default_profile_photo($size = 300) { $scheme = get_config('system','default_profile_photo'); if(! $scheme) - $scheme = 'rainbow_man'; + $scheme = 'human_confusion'; if(! is_dir('images/default_profile_photos/' . $scheme)) { $x = [ 'scheme' => $scheme, 'size' => $size, 'url' => '' ]; @@ -2030,7 +2030,7 @@ function get_default_profile_photo($size = 300) { return $x['url']; } else { - $scheme = 'rainbow_man'; + $scheme = 'human_confusion'; } } diff --git a/view/de-de/invite.casual.subject.tpl b/view/de-de/invite.casual.subject.tpl new file mode 100644 index 000000000..b64cf59a9 --- /dev/null +++ b/view/de-de/invite.casual.subject.tpl @@ -0,0 +1 @@ +Schließe dich uns auf {{$projectname}} an! \ No newline at end of file diff --git a/view/de-de/invite.casual.tpl b/view/de-de/invite.casual.tpl new file mode 100644 index 000000000..ce587a739 --- /dev/null +++ b/view/de-de/invite.casual.tpl @@ -0,0 +1,15 @@ +de casual +Bitte schließe dich meiner Community auf {{$projectname}} an. +{{$linktxt}} {{$invite_where}} + +Verwende bei der Registrierung diesen Einladungscode: + {{$invite_code}} + +Oder: + +1. Registriere dich auf auf einer beliebigen {{$projectname}}-Instanz + (sie sind alle miteinander verbunden). +2. Gib meine {{$Projectname}} Netzwerk Adresse in dem Suchfeld ein: + {{$invite_whereami}} + oder besuche {{$invite_whoami}} +3. Klicke auf [Verbinden] diff --git a/view/de-de/invite.formal.subject.tpl b/view/de-de/invite.formal.subject.tpl new file mode 100644 index 000000000..0aa97e198 --- /dev/null +++ b/view/de-de/invite.formal.subject.tpl @@ -0,0 +1 @@ +Einladung für Ihren Netzwerkzugang auf {{$invite_loc}} \ No newline at end of file diff --git a/view/de-de/invite.formal.tpl b/view/de-de/invite.formal.tpl new file mode 100644 index 000000000..96bc64ba9 --- /dev/null +++ b/view/de-de/invite.formal.tpl @@ -0,0 +1,19 @@ +Wenn Sie mögen, können Sie sich den dezentralen Sozialen Netzwerken von {{$projectname}} +hier anschließen: {{$invite_where}} +Um den Zugang zu ermöglichen, werden Sie wahrscheinlich einmalig aufgefordert, +diesen Einladungscode anzugeben: {{$invite_code}} +Bei der Registrierung ist auch Ihre eMail Adresse zu nennen, sowie ein Kennwort festzulegen, +das vertraulich ist allein Ihnen bekannt sein soll. + +Alternative Möglichkeiten: + +1. Eine Registrierung wird an jeder der öffentlich zugänglichen {{$projectname}} Instanzen unterstützt, + weil die alle miteinander verbunden sind. Eine Übersicht ist zu finden unter: + {{$invite_anywhere}} +2. Geben Sie meine {{$projectname}} Netzwerkadresse {{$invite_whereami}} in die Suchleiste beim + Lupensymbol ein oder besuchen Sie mich unter {{$invite_whoami}} +3. Klicken Sie auf [Verbinden] + +Falls auf einer besuchten {{$projectname}} Instanz fremdsprachige Anzeigen dargestellt sind, +können Sie die Anzeige einfach auf eine eigene (oder bevorzugte) Sprache im +Hamburger Menü  umschalten. diff --git a/view/en/invite.casual.subject.tpl b/view/en/invite.casual.subject.tpl new file mode 100644 index 000000000..e3c7c91fc --- /dev/null +++ b/view/en/invite.casual.subject.tpl @@ -0,0 +1 @@ +Please join us on {{$projectname}} {{$invite_loc}} \ No newline at end of file diff --git a/view/en/invite.casual.tpl b/view/en/invite.casual.tpl new file mode 100644 index 000000000..4fd031c63 --- /dev/null +++ b/view/en/invite.casual.tpl @@ -0,0 +1,16 @@ +{{* tpl EN casual, to invite friendly to those knowing me *}} +Please join my community on {{$projectname}}. +{{$linktxt}} {{$invite_where}} + +You will need to supply this invitation code: + {{$invite_code}} + +Or: + +1. Register at any {{$projectname}} location + (they are all inter-connected). +2. Enter my {{$Projectname}} network address into the site searchbar. + {{$invite_whereami}} + or visit {{$invite_whoami}} +3. Click [Connect] + diff --git a/view/en/invite.formal.subject.tpl b/view/en/invite.formal.subject.tpl new file mode 100644 index 000000000..3c5a92763 --- /dev/null +++ b/view/en/invite.formal.subject.tpl @@ -0,0 +1 @@ +Invitation for your network access on {{$invite_loc}} \ No newline at end of file diff --git a/view/en/invite.formal.tpl b/view/en/invite.formal.tpl new file mode 100644 index 000000000..5f70de00a --- /dev/null +++ b/view/en/invite.formal.tpl @@ -0,0 +1,32 @@ +{{* tpl EN formal, to invite most polite, like company members or business partners *}} +Please join the communication platform {{$projectname}} and this message contains the +essential data for initially connecting to. + +The site is to arrive here: {{$invite_whereami}} + +Your access is just prepared with an invite code + + {{$invite_code}} + +what please is to enter into the field of the register form, that is shown when the +link "I have an invite code" will be clicked. Please also enter your email address +in the next field. We want to let you know, the invite code is bound to your email +address and not transferable. + +For security reasons you have to supply an account password that is and should remain +only known by yourself. The non visible password has to be typed in twice to prevent +mistyping. The password is required later always when you want to login on the site. + +Depending on the site's configuration, you may receive another email to your address +with a validation code, that is to enter into the form such email will point to. This +kind of some inconvience helps to grow security for the site. + +Depending on the site's configuration, an instance administrator finally has to +confirm your access. Please be patient because that will not performed immediatly +in real time. + +Kind regards, +and wish to have best success on the site. + +Disclaimer: +... \ No newline at end of file diff --git a/view/en/invite.material.subject.tpl b/view/en/invite.material.subject.tpl new file mode 100644 index 000000000..b74c99aa4 --- /dev/null +++ b/view/en/invite.material.subject.tpl @@ -0,0 +1 @@ +Invitation {{$invite_loc}} \ No newline at end of file diff --git a/view/en/invite.material.tpl b/view/en/invite.material.tpl new file mode 100644 index 000000000..db1613083 --- /dev/null +++ b/view/en/invite.material.tpl @@ -0,0 +1 @@ +{{* tpl en material, to invite with the essential data in brief *}} \ No newline at end of file diff --git a/view/en/register_verify_member.tpl b/view/en/register_verify_member.tpl index 9bdd7fa51..5db51a2e2 100644 --- a/view/en/register_verify_member.tpl +++ b/view/en/register_verify_member.tpl @@ -15,15 +15,19 @@ Your validation code is {{$hash}} +{{if $due}}{{$due}}{{/if}} + + + If you registered this account, please enter the validation code when requested or visit the following link: -{{$siteurl}}/regver/allow/{{$hash}} +{{$siteurl}}/regate/{{$mail}} To deny the request and remove the account, please visit: -{{$siteurl}}/regver/deny/{{$hash}} +{{$siteurl}}/regate/{{$mail}}{{if $ko}}/{{$ko}}{{/if}} Thank you. diff --git a/view/es-es/invite.casual.subject.tpl b/view/es-es/invite.casual.subject.tpl new file mode 100644 index 000000000..bec594c3f --- /dev/null +++ b/view/es-es/invite.casual.subject.tpl @@ -0,0 +1 @@ +Por favor, acompáñenos en {{$projectname}} \ No newline at end of file diff --git a/view/es-es/invite.casual.tpl b/view/es-es/invite.casual.tpl new file mode 100644 index 000000000..51d5ad3cb --- /dev/null +++ b/view/es-es/invite.casual.tpl @@ -0,0 +1,14 @@ +Por favor, únase a mi comunidad en {{$projectname}}. +{{$linktxt}} {{$invite_where}} + +Tendrá que proporcionar este código de invitación: + {{$invite_code}} + +O: + +1. Registrarse en cualquier lugar {{$projectname}} + (todos están interconectados). +2. 2. Introduzca mi dirección de red {{$projectname}} en la barra de búsqueda del sitio. + {{$invite_whereami}} + o visite {{$invite_whoami}} +3. 3. Haga clic en [Conectar]. diff --git a/view/es-es/invite.formal.subject.tpl b/view/es-es/invite.formal.subject.tpl new file mode 100644 index 000000000..e4a104c46 --- /dev/null +++ b/view/es-es/invite.formal.subject.tpl @@ -0,0 +1 @@ +Invitación para su acceso a la red en {{$invite_loc}} \ No newline at end of file diff --git a/view/es-es/invite.formal.tpl b/view/es-es/invite.formal.tpl new file mode 100644 index 000000000..6c0841f84 --- /dev/null +++ b/view/es-es/invite.formal.tpl @@ -0,0 +1,19 @@ +Si lo desea, puede unirse a las redes sociales descentralizadas de {{$projectname}} +aquí: {{$invite_where}} +Probablemente se le pedirá una vez que permita el acceso, +indicar este código de invitación: {{$invite_code}} +Durante el proceso de registro también debe proporcionar su dirección de correo electrónico y establecer una contraseña, +que es confidencial y sólo debe ser conocido por usted. + +Posibilidades alternativas: + +1. Eine Registrierung wird an jeder der öffentlich zugänglichen {{$projectname}} Instanzen unterstützt, + weil die alle miteinander verbunden sind. Eine Übersicht ist zu finden unter: + {{$invite_anywhere}} +2. Geben Sie meine {{$projectname}} Netzwerkadresse {{$invite_whereami}} in die Suchleiste beim + Lupensymbol ein oder besuchen Sie mich unter {{$invite_whoami}} +3. Klicken Sie auf [Verbinden] + +Falls auf einer besuchten {{$projectname}} Instanz fremdsprachige Anzeigen dargestellt sind, +können Sie die Anzeige einfach auf eine eigene (oder bevorzugte) Sprache im +Hamburger Menü  umschalten. -- cgit v1.2.3