{
return ldap_bind($ldapConnection, $bindRdn, $bindPassword);
}
+
+ /**
+ * Explode a LDAP dn string into an array of components.
+ * @param string $dn
+ * @param int $withAttrib
+ * @return array
+ */
+ public function explodeDn(string $dn, int $withAttrib)
+ {
+ return ldap_explode_dn($dn, $withAttrib);
+ }
+
+ /**
+ * Escape a string for use in an LDAP filter.
+ * @param string $value
+ * @param string $ignore
+ * @param int $flags
+ * @return string
+ */
+ public function escape(string $value, string $ignore = "", int $flags = 0)
+ {
+ return ldap_escape($value, $ignore, $flags);
+ }
}
if ($ldapUser === null) {
return false;
}
+
if ($ldapUser['uid'] !== $user->external_auth_id) {
return false;
}
$newAttrs = [];
foreach ($attrs as $key => $attrText) {
$newKey = '${' . $key . '}';
- $newAttrs[$newKey] = $attrText;
+ $newAttrs[$newKey] = $this->ldap->escape($attrText);
}
return strtr($filterString, $newAttrs);
}
$baseDn = $this->config['base_dn'];
$groupsAttr = strtolower($this->config['group_attribute']);
- $groups = $this->ldap->searchAndGetEntries($ldapConnection, $baseDn, 'CN='.$groupName, [$groupsAttr]);
+ $groupFilter = 'CN=' . $this->ldap->escape($groupName);
+ $groups = $this->ldap->searchAndGetEntries($ldapConnection, $baseDn, $groupFilter, [$groupsAttr]);
if ($groups['count'] === 0) {
return [];
}
/**
* Filter out LDAP CN and DN language in a ldap search return
* Gets the base CN (common name) of the string
- * @param string $ldapSearchReturn
+ * @param array $userGroupSearchResponse
* @return array
*/
- protected function groupFilter($ldapSearchReturn)
+ protected function groupFilter(array $userGroupSearchResponse)
{
$groupsAttr = strtolower($this->config['group_attribute']);
$ldapGroups = [];
$count = 0;
- if (isset($ldapSearchReturn[$groupsAttr]['count'])) {
- $count = (int) $ldapSearchReturn[$groupsAttr]['count'];
+
+ if (isset($userGroupSearchResponse[$groupsAttr]['count'])) {
+ $count = (int) $userGroupSearchResponse[$groupsAttr]['count'];
}
+
for ($i=0; $i<$count; $i++) {
- $dnComponents = ldap_explode_dn($ldapSearchReturn[$groupsAttr][$i], 1);
+ $dnComponents = $this->ldap->explodeDn($userGroupSearchResponse[$groupsAttr][$i], 1);
if (!in_array($dnComponents[0], $ldapGroups)) {
$ldapGroups[] = $dnComponents[0];
}
}
+
return $ldapGroups;
}
{
$locale = app()->getLocale();
$cacheKey = 'GLOBAL_TRANSLATIONS_' . $locale;
+
if (cache()->has($cacheKey) && config('app.env') !== 'development') {
$resp = cache($cacheKey);
} else {
'entities' => trans('entities'),
'errors' => trans('errors')
];
- if ($locale !== 'en') {
- $enTrans = [
- 'common' => trans('common', [], 'en'),
- 'components' => trans('components', [], 'en'),
- 'entities' => trans('entities', [], 'en'),
- 'errors' => trans('errors', [], 'en')
- ];
- $translations = array_replace_recursive($enTrans, $translations);
- }
$resp = 'window.translations = ' . json_encode($translations);
cache()->put($cacheKey, $resp, 120);
}
-<?php
+<?php namespace BookStack\Notifications;
-namespace BookStack\Notifications;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
-
-class ConfirmEmail extends Notification implements ShouldQueue
+class ConfirmEmail extends MailNotification
{
-
- use Queueable;
-
public $token;
/**
$this->token = $token;
}
- /**
- * Get the notification's delivery channels.
- *
- * @param mixed $notifiable
- * @return array
- */
- public function via($notifiable)
- {
- return ['mail'];
- }
-
/**
* Get the mail representation of the notification.
*
public function toMail($notifiable)
{
$appName = ['appName' => setting('app-name')];
- return (new MailMessage)
- ->subject(trans('auth.email_confirm_subject', $appName))
- ->greeting(trans('auth.email_confirm_greeting', $appName))
- ->line(trans('auth.email_confirm_text'))
- ->action(trans('auth.email_confirm_action'), baseUrl('/register/confirm/' . $this->token));
+ return $this->newMailMessage()
+ ->subject(trans('auth.email_confirm_subject', $appName))
+ ->greeting(trans('auth.email_confirm_greeting', $appName))
+ ->line(trans('auth.email_confirm_text'))
+ ->action(trans('auth.email_confirm_action'), baseUrl('/register/confirm/' . $this->token));
}
}
--- /dev/null
+<?php namespace BookStack\Notifications;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class MailNotification extends Notification implements ShouldQueue
+{
+ use Queueable;
+
+ /**
+ * Get the notification's channels.
+ *
+ * @param mixed $notifiable
+ * @return array|string
+ */
+ public function via($notifiable)
+ {
+ return ['mail'];
+ }
+
+ /**
+ * Create a new mail message.
+ * @return MailMessage
+ */
+ protected function newMailMessage()
+ {
+ return (new MailMessage)->view([
+ 'html' => 'vendor.notifications.email',
+ 'text' => 'vendor.notifications.email-plain'
+ ]);
+ }
+
+}
\ No newline at end of file
-<?php
+<?php namespace BookStack\Notifications;
-namespace BookStack\Notifications;
-use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
-
-class ResetPassword extends Notification
+class ResetPassword extends MailNotification
{
/**
* The password reset token.
$this->token = $token;
}
- /**
- * Get the notification's channels.
- *
- * @param mixed $notifiable
- * @return array|string
- */
- public function via($notifiable)
- {
- return ['mail'];
- }
-
/**
* Build the mail representation of the notification.
*
*/
public function toMail()
{
- return (new MailMessage)
+ return $this->newMailMessage()
->subject(trans('auth.email_reset_subject', ['appName' => setting('app-name')]))
->line(trans('auth.email_reset_text'))
->action(trans('auth.reset_password'), baseUrl('password/reset/' . $this->token))
--- /dev/null
+<?php namespace BookStack\Providers;
+
+
+use BookStack\Translation\Translator;
+
+class TranslationServiceProvider extends \Illuminate\Translation\TranslationServiceProvider
+{
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->registerLoader();
+
+ $this->app->singleton('translator', function ($app) {
+ $loader = $app['translation.loader'];
+
+ // When registering the translator component, we'll need to set the default
+ // locale as well as the fallback locale. So, we'll grab the application
+ // configuration so we can easily get both of these values from there.
+ $locale = $app['config']['app.locale'];
+
+ $trans = new Translator($loader, $locale);
+
+ $trans->setFallback($app['config']['app.fallback_locale']);
+
+ return $trans;
+ });
+ }
+}
\ No newline at end of file
--- /dev/null
+<?php namespace BookStack\Translation;
+
+
+class Translator extends \Illuminate\Translation\Translator
+{
+
+ /**
+ * Mapping of locales to their base locales
+ * @var array
+ */
+ protected $baseLocaleMap = [
+ 'de_informal' => 'de',
+ ];
+
+ /**
+ * Get the translation for a given key.
+ *
+ * @param string $key
+ * @param array $replace
+ * @param string $locale
+ * @return string|array|null
+ */
+ public function trans($key, array $replace = [], $locale = null)
+ {
+ $translation = $this->get($key, $replace, $locale);
+
+ if (is_array($translation)) {
+ $translation = $this->mergeBackupTranslations($translation, $key, $locale);
+ }
+
+ return $translation;
+ }
+
+ /**
+ * Merge the fallback translations, and base translations if existing,
+ * into the provided core key => value array of translations content.
+ * @param array $translationArray
+ * @param string $key
+ * @param null $locale
+ * @return array
+ */
+ protected function mergeBackupTranslations(array $translationArray, string $key, $locale = null)
+ {
+ $fallback = $this->get($key, [], $this->fallback);
+ $baseLocale = $this->getBaseLocale($locale ?? $this->locale);
+ $baseTranslations = $baseLocale ? $this->get($key, [], $baseLocale) : [];
+
+ return array_replace_recursive($fallback, $baseTranslations, $translationArray);
+ }
+
+ /**
+ * Get the array of locales to be checked.
+ *
+ * @param string|null $locale
+ * @return array
+ */
+ protected function localeArray($locale)
+ {
+ $primaryLocale = $locale ?: $this->locale;
+ return array_filter([$primaryLocale, $this->getBaseLocale($primaryLocale), $this->fallback]);
+ }
+
+ /**
+ * Get the locale to extend for the given locale.
+ *
+ * @param string $locale
+ * @return string|null
+ */
+ protected function getBaseLocale($locale)
+ {
+ return $this->baseLocaleMap[$locale] ?? null;
+ }
+
+}
\ No newline at end of file
"type": "project",
"require": {
"php": ">=7.0.0",
+ "ext-json": "*",
"ext-tidy": "*",
"ext-dom": "*",
"laravel/framework": "~5.5.44",
*/
'locale' => env('APP_LANG', 'en'),
- 'locales' => ['en', 'ar', 'de', 'es', 'es_AR', 'fr', 'nl', 'pt_BR', 'sk', 'sv', 'kr', 'ja', 'pl', 'it', 'ru', 'zh_CN', 'zh_TW'],
+ 'locales' => ['en', 'ar', 'de', 'de_informal', 'es', 'es_AR', 'fr', 'nl', 'pt_BR', 'sk', 'sv', 'kr', 'ja', 'pl', 'it', 'ru', 'zh_CN', 'zh_TW'],
/*
|--------------------------------------------------------------------------
Illuminate\Redis\RedisServiceProvider::class,
Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
Illuminate\Session\SessionServiceProvider::class,
- Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
Illuminate\Notifications\NotificationServiceProvider::class,
* Application Service Providers...
*/
BookStack\Providers\PaginationServiceProvider::class,
+ BookStack\Providers\TranslationServiceProvider::class,
BookStack\Providers\AuthServiceProvider::class,
BookStack\Providers\AppServiceProvider::class,
/*
|--------------------------------------------------------------------------
- | Mail "Pretend"
+ | Markdown Mail Settings
|--------------------------------------------------------------------------
|
- | When this option is enabled, e-mail will not actually be sent over the
- | web and will instead be written to your application's logs files so
- | you may inspect the message. This is great for local development.
+ | If you are using Markdown based email rendering, you may configure your
+ | theme and component paths here, allowing you to customize the design
+ | of the emails. Or, you may simply stick with the Laravel defaults!
|
*/
-
- 'pretend' => env('MAIL_PRETEND', false),
+ 'markdown' => [
+ 'theme' => 'default',
+ 'paths' => [
+ resource_path('views/vendor/mail'),
+ ],
+ ],
];
sh: 'shell',
bash: 'shell',
toml: 'toml',
- sql: 'sql',
+ sql: 'text/x-sql',
xml: 'xml',
yaml: 'yaml',
yml: 'yaml',
--- /dev/null
+<?php
+
+// Extends 'de'
+return [
+ //
+];
\ No newline at end of file
--- /dev/null
+<?php
+
+// Extends 'de'
+return [
+
+ /*
+ |--------------------------------------------------------------------------
+ | Authentication Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | The following language lines are used during authentication for various
+ | messages that we need to display to the user. You are free to modify
+ | these language lines according to your application's requirements.
+ |
+ */
+ 'throttle' => 'Zu viele Anmeldeversuche. Bitte versuche es in :seconds Sekunden erneut.',
+
+ /**
+ * Login & Register
+ */
+ 'ldap_email_hint' => 'Bitte gib eine E-Mail-Adresse ein, um diese mit dem Account zu nutzen.',
+ 'register_confirm' => 'Bitte prüfe Deinen Posteingang und bestätig die Registrierung.',
+ 'registration_email_domain_invalid' => 'Du kannst dich mit dieser E-Mail nicht registrieren.',
+ 'register_success' => 'Vielen Dank für Deine Registrierung! Die Daten sind gespeichert und Du bist angemeldet.',
+
+ /**
+ * Password Reset
+ */
+ 'reset_password_send_instructions' => 'Bitte gib Deine E-Mail-Adresse ein. Danach erhältst Du eine E-Mail mit einem Link zum Zurücksetzen Deines Passwortes.',
+ 'reset_password_sent_success' => 'Eine E-Mail mit dem Link zum Zurücksetzen Deines Passwortes wurde an :email gesendet.',
+ 'reset_password_success' => 'Dein Passwort wurde erfolgreich zurückgesetzt.',
+ 'email_reset_text' => 'Du erhältsts diese E-Mail, weil jemand versucht hat, Dein Passwort zurückzusetzen.',
+ 'email_reset_not_requested' => 'Wenn Du das nicht warst, brauchst Du nichts weiter zu tun.',
+
+ /**
+ * Email Confirmation
+ */
+ 'email_confirm_subject' => 'Bestätige Deine E-Mail-Adresse für :appName',
+ 'email_confirm_greeting' => 'Danke, dass Du dich für :appName registrierst hast!',
+ 'email_confirm_text' => 'Bitte bestätige Deine E-Mail-Adresse, indem Du auf die Schaltfläche klickst:',
+ 'email_confirm_send_error' => 'Leider konnte die für die Registrierung notwendige E-Mail zur Bestätigung Deine E-Mail-Adresse nicht versandt werden. Bitte kontaktiere den Systemadministrator!',
+ 'email_confirm_success' => 'Deine E-Mail-Adresse wurde bestätigt!',
+ 'email_confirm_resent' => 'Bestätigungs-E-Mail wurde erneut versendet, bitte überprüfe Deinen Posteingang.',
+ 'email_not_confirmed_text' => 'Deine E-Mail-Adresse ist bisher nicht bestätigt.',
+ 'email_not_confirmed_click_link' => 'Bitte klicke auf den Link in der E-Mail, die Du nach der Registrierung erhalten hast.',
+ 'email_not_confirmed_resend' => 'Wenn Du die E-Mail nicht erhalten hast, kannst Du die Nachricht erneut anfordern. Fülle hierzu bitte das folgende Formular aus:',
+];
\ No newline at end of file
--- /dev/null
+<?php
+
+// Extends 'de'
+return [
+ /**
+ * Email Content
+ */
+ 'email_action_help' => 'Sollte es beim Anklicken der Schaltfläche ":action_text" Probleme geben, öffne die folgende URL in Deinem Browser:',
+];
\ No newline at end of file
--- /dev/null
+<?php
+
+// Extends 'de'
+return [
+ /**
+ * Image Manager
+ */
+ 'image_delete_confirm' => 'Bitte klicke erneut auf löschen, wenn Du dieses Bild wirklich entfernen möchtest.',
+ 'image_dropzone' => 'Ziehe Bilder hierher oder klicke hier, um ein Bild auszuwählen',
+];
\ No newline at end of file
--- /dev/null
+<?php
+
+// Extends 'de'
+return [
+ /**
+ * Shared
+ */
+ 'no_pages_viewed' => 'Du hast bisher keine Seiten angesehen.',
+ 'no_pages_recently_created' => 'Du hast bisher keine Seiten angelegt.',
+ 'no_pages_recently_updated' => 'Du hast bisher keine Seiten aktualisiert.',
+
+ /**
+ * Books
+ */
+ 'books_delete_confirmation' => 'Bist Du sicher, dass Du dieses Buch löschen möchtest?',
+
+ /**
+ * Chapters
+ */
+ 'chapters_delete_confirm' => 'Bist Du sicher, dass Du dieses Kapitel löschen möchtest?',
+
+ /**
+ * Pages
+ */
+ 'pages_delete_confirm' => 'Bist Du sicher, dass Du diese Seite löschen möchtest?',
+ 'pages_delete_draft_confirm' => 'Bist Du sicher, dass Du diesen Seitenentwurf löschen möchtest?',
+ 'pages_edit_enter_changelog_desc' => 'Bitte gib eine kurze Zusammenfassung Deiner Änderungen ein',
+ 'pages_editing_draft_notification' => 'Du bearbeitest momenten einen Entwurf, der zuletzt :timeDiff gespeichert wurde.',
+ 'pages_draft_edit_active' => [
+ 'start_a' => ':count Benutzer bearbeiten derzeit diese Seite.',
+ 'start_b' => ':userName bearbeitet jetzt diese Seite.',
+ 'time_a' => 'seit die Seiten zuletzt aktualisiert wurden.',
+ 'time_b' => 'in den letzten :minCount Minuten',
+ 'message' => ':start :time. Achte darauf, keine Änderungen von anderen Benutzern zu überschreiben!',
+ ],
+
+ /**
+ * Editor sidebar
+ */
+ 'tags_explain' => "Füge Schlagwörter hinzu, um ihren Inhalt zu kategorisieren.\nDu kannst einen erklärenden Inhalt hinzufügen, um eine genauere Unterteilung vorzunehmen.",
+ 'attachments_explain' => 'Du kannst auf Deiner Seite Dateien hochladen oder Links hinzufügen. Diese werden in der Seitenleiste angezeigt.',
+ 'attachments_delete_confirm' => 'Klicke erneut auf löschen, um diesen Anhang zu entfernen.',
+ 'attachments_dropzone' => 'Ziehe Dateien hierher oder klicke hier, um eine Datei auszuwählen',
+ 'attachments_explain_link' => 'Wenn Du keine Datei hochladen möchtest, kannst Du stattdessen einen Link hinzufügen. Dieser Link kann auf eine andere Seite oder eine Datei im Internet verweisen.',
+ 'attachments_edit_drop_upload' => 'Ziehe Dateien hierher, um diese hochzuladen und zu überschreiben',
+
+ /**
+ * Comments
+ */
+ 'comment_placeholder' => 'Gib hier Deine Kommentare ein (Markdown unterstützt)',
+ 'comment_delete_confirm' => 'Möchtst Du diesen Kommentar wirklich löschen?',
+
+ /**
+ * Revision
+ */
+ 'revision_delete_confirm' => 'Bist Du sicher, dass Du diese Revision löschen möchtest?',
+];
--- /dev/null
+<?php
+
+// Extends 'de'
+return [
+ // Pages
+ 'permission' => 'Du hast keine Berechtigung, auf diese Seite zuzugreifen.',
+ 'permissionJson' => 'Du hast keine Berechtigung, die angeforderte Aktion auszuführen.',
+
+ // Auth
+ 'email_already_confirmed' => 'Die E-Mail-Adresse ist bereits bestätigt. Bitte melde dich an.',
+ 'email_confirmation_invalid' => 'Der Bestätigungslink ist nicht gültig oder wurde bereits verwendet. Bitte registriere dich erneut.',
+ 'social_account_in_use' => 'Dieses :socialAccount-Konto wird bereits verwendet. Bitte melde dich mit dem :socialAccount-Konto an.',
+ 'social_account_email_in_use' => 'Die E-Mail-Adresse ":email" ist bereits registriert. Wenn Du bereits registriert bist, kannst Du Dein :socialAccount-Konto in Deinen Profil-Einstellungen verknüpfen.',
+ 'social_account_not_used' => 'Dieses :socialAccount-Konto ist bisher keinem Benutzer zugeordnet. Du kannst das in Deinen Profil-Einstellungen tun.',
+ 'social_account_register_instructions' => 'Wenn Du bisher kein Social-Media Konto besitzt, kannst Du ein solches Konto mit der :socialAccount Option anlegen.',
+
+ // System
+ 'path_not_writable' => 'Die Datei kann nicht in den angegebenen Pfad :filePath hochgeladen werden. Stelle sicher, dass dieser Ordner auf dem Server beschreibbar ist.',
+ 'cannot_create_thumbs' => 'Der Server kann keine Vorschau-Bilder erzeugen. Bitte prüfe, ob die GD PHP-Erweiterung installiert ist.',
+ 'server_upload_limit' => 'Der Server verbietet das Hochladen von Dateien mit dieser Dateigröße. Bitte versuche es mit einer kleineren Datei.',
+
+ // Pages
+ 'page_draft_autosave_fail' => 'Fehler beim Speichern des Entwurfs. Stelle sicher, dass Du mit dem Internet verbunden bist, bevor Du den Entwurf dieser Seite speicherst.',
+ 'page_custom_home_deletion' => 'Eine als Startseite gesetzte Seite kann nicht gelöscht werden.',
+
+ // Users
+ 'users_cannot_delete_only_admin' => 'Du kannst den einzigen Administrator nicht löschen.',
+ 'users_cannot_delete_guest' => 'Du kannst den Gast-Benutzer nicht löschen',
+
+ // Error pages
+ 'sorry_page_not_found' => 'Entschuldigung. Die Seite, die Du angefordert hast, wurde nicht gefunden.',
+];
--- /dev/null
+<?php
+
+// Extends 'de'
+return [
+ //
+];
\ No newline at end of file
--- /dev/null
+<?php
+
+// Extends 'de'
+return [
+ //
+];
\ No newline at end of file
--- /dev/null
+<?php
+
+// Extends 'de'
+return [
+ /**
+ * Settings text strings
+ * Contains all text strings used in the general settings sections of BookStack
+ * including users and roles.
+ */
+
+ /**
+ * App settings
+ */
+ 'app_editor_desc' => 'Wähle den Editor aus, der von allen Benutzern genutzt werden soll, um Seiten zu editieren.',
+ 'app_primary_color_desc' => "Dies sollte ein HEX Wert sein.\nWenn Du nichts eingibst, wird die Anwendung auf die Standardfarbe zurückgesetzt.",
+ 'app_homepage_desc' => 'Wähle eine Seite als Startseite aus, die statt der Standardansicht angezeigt werden soll. Seitenberechtigungen werden für die ausgewählten Seiten ignoriert.',
+ 'app_homepage_books' => 'Oder wähle die Buch-Übersicht als Startseite. Das wird die Seiten-Auswahl überschreiben.',
+
+ /**
+ * Maintenance settings
+ */
+ 'maint_image_cleanup_desc' => 'Überprüft Seiten- und Versionsinhalte auf ungenutzte und mehrfach vorhandene Bilder. Erstelle vor dem Start ein Backup Deiner Datenbank und Bilder.',
+ 'maint_image_cleanup_warning' => ':count eventuell unbenutze Bilder wurden gefunden. Möchtest Du diese Bilder löschen?',
+
+ /**
+ * Role settings
+ */
+ 'role_delete_confirm' => 'Du möchtest die Rolle ":roleName" löschen.',
+ 'role_delete_users_assigned' => 'Diese Rolle ist :userCount Benutzern zugeordnet. Du kannst unten eine neue Rolle auswählen, die Du diesen Benutzern zuordnen möchtest.',
+ 'role_delete_sure' => 'Bist Du sicher, dass Du diese Rolle löschen möchtest?',
+
+ /**
+ * Users
+ */
+ 'users_password_warning' => 'Fülle die folgenden Felder nur aus, wenn Du Dein Passwort ändern möchtest:',
+ 'users_delete_confirm' => 'Bist Du sicher, dass Du diesen Benutzer löschen möchtest?',
+ 'users_social_accounts_info' => 'Hier kannst Du andere Social-Media-Konten für eine schnellere und einfachere Anmeldung verknüpfen. Wenn Du ein Social-Media Konto löschst, bleibt der Zugriff erhalten. Entferne in diesem Falle die Berechtigung in Deinen Profil-Einstellungen des verknüpften Social-Media-Kontos.',
+];
--- /dev/null
+<?php
+
+// Extends 'de'
+return [
+ //
+];
\ No newline at end of file
<?php
-
+/**
+ * Activity text strings.
+ * Is used for all the text within activity logs & notifications.
+ */
return [
- /**
- * Activity text strings.
- * Is used for all the text within activity logs & notifications.
- */
-
// Pages
'page_create' => 'created page',
'page_create_notification' => 'Page Successfully Created',
<?php
+/**
+ * Authentication Language Lines
+ * The following language lines are used during authentication for various
+ * messages that we need to display to the user.
+ */
return [
- /*
- |--------------------------------------------------------------------------
- | Authentication Language Lines
- |--------------------------------------------------------------------------
- |
- | The following language lines are used during authentication for various
- | messages that we need to display to the user. You are free to modify
- | these language lines according to your application's requirements.
- |
- */
+
'failed' => 'These credentials do not match our records.',
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
- /**
- * Login & Register
- */
+ // Login & Register
'sign_up' => 'Sign up',
'log_in' => 'Log in',
'log_in_with' => 'Login with :socialDriver',
'register_success' => 'Thanks for signing up! You are now registered and signed in.',
- /**
- * Password Reset
- */
+ // Password Reset
'reset_password' => 'Reset Password',
'reset_password_send_instructions' => 'Enter your email below and you will be sent an email with a password reset link.',
'reset_password_send_button' => 'Send Reset Link',
'reset_password_sent_success' => 'A password reset link has been sent to :email.',
'reset_password_success' => 'Your password has been successfully reset.',
-
'email_reset_subject' => 'Reset your :appName password',
'email_reset_text' => 'You are receiving this email because we received a password reset request for your account.',
'email_reset_not_requested' => 'If you did not request a password reset, no further action is required.',
- /**
- * Email Confirmation
- */
+ // Email Confirmation
'email_confirm_subject' => 'Confirm your email on :appName',
'email_confirm_greeting' => 'Thanks for joining :appName!',
'email_confirm_text' => 'Please confirm your email address by clicking the button below:',
<?php
+/**
+ * Common elements found throughout many areas of BookStack.
+ */
return [
- /**
- * Buttons
- */
+ // Buttons
'cancel' => 'Cancel',
'confirm' => 'Confirm',
'back' => 'Back',
'select' => 'Select',
'more' => 'More',
- /**
- * Form Labels
- */
+ // Form Labels
'name' => 'Name',
'description' => 'Description',
'role' => 'Role',
'cover_image' => 'Cover image',
'cover_image_description' => 'This image should be approx 440x250px.',
- /**
- * Actions
- */
+ // Actions
'actions' => 'Actions',
'view' => 'View',
'create' => 'Create',
'remove' => 'Remove',
'add' => 'Add',
- /**
- * Misc
- */
+ // Misc
'deleted_user' => 'Deleted User',
'no_activity' => 'No activity to show',
'no_items' => 'No items available',
'list_view' => 'List View',
'default' => 'Default',
- /**
- * Header
- */
+ // Header
'view_profile' => 'View Profile',
'edit_profile' => 'Edit Profile',
- /**
- * Email Content
- */
+ // Email Content
'email_action_help' => 'If you’re having trouble clicking the ":actionText" button, copy and paste the URL below into your web browser:',
'email_rights' => 'All rights reserved',
];
\ No newline at end of file
<?php
+/**
+ * Text used in custom JavaScript driven components.
+ */
return [
- /**
- * Image Manager
- */
+ // Image Manager
'image_select' => 'Image Select',
'image_all' => 'All',
'image_all_title' => 'View all images',
'image_delete_success' => 'Image successfully deleted',
'image_upload_remove' => 'Remove',
- /**
- * Code editor
- */
+ // Code Editor
'code_editor' => 'Edit Code',
'code_language' => 'Code Language',
'code_content' => 'Code Content',
<?php
+/**
+ * Text used for 'Entities' (Document Structure Elements) such as
+ * Books, Shelves, Chapters & Pages
+ */
return [
- /**
- * Shared
- */
+ // Shared
'recently_created' => 'Recently Created',
'recently_created_pages' => 'Recently Created Pages',
'recently_updated_pages' => 'Recently Updated Pages',
'export_pdf' => 'PDF File',
'export_text' => 'Plain Text File',
- /**
- * Permissions and restrictions
- */
+ // Permissions and restrictions
'permissions' => 'Permissions',
'permissions_intro' => 'Once enabled, These permissions will take priority over any set role permissions.',
'permissions_enable' => 'Enable Custom Permissions',
'permissions_save' => 'Save Permissions',
- /**
- * Search
- */
+ // Search
'search_results' => 'Search Results',
'search_total_results_found' => ':count result found|:count total results found',
'search_clear' => 'Clear Search',
'search_set_date' => 'Set Date',
'search_update' => 'Update Search',
- /**
- * Shelves
- */
+ // Shelves
'shelf' => 'Shelf',
'shelves' => 'Shelves',
'shelves_long' => 'Bookshelves',
'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this bookshelf to all books contained within. Before activating, ensure any changes to the permissions of this bookshelf have been saved.',
'shelves_copy_permission_success' => 'Bookshelf permissions copied to :count books',
- /**
- * Books
- */
+ // Books
'book' => 'Book',
'books' => 'Books',
'x_books' => ':count Book|:count Books',
'books_sort_show_other' => 'Show Other Books',
'books_sort_save' => 'Save New Order',
- /**
- * Chapters
- */
+ // Chapters
'chapter' => 'Chapter',
'chapters' => 'Chapters',
'x_chapters' => ':count Chapter|:count Chapters',
'chapters_permissions_success' => 'Chapter Permissions Updated',
'chapters_search_this' => 'Search this chapter',
- /**
- * Pages
- */
+ // Pages
'page' => 'Page',
'pages' => 'Pages',
'x_pages' => ':count Page|:count Pages',
'pages_draft_discarded' => 'Draft discarded, The editor has been updated with the current page content',
'pages_specific' => 'Specific Page',
- /**
- * Editor sidebar
- */
+ // Editor Sidebar
'page_tags' => 'Page Tags',
'chapter_tags' => 'Chapter Tags',
'book_tags' => 'Book Tags',
'attachments_file_updated' => 'File successfully updated',
'attachments_link_attached' => 'Link successfully attached to page',
- /**
- * Profile View
- */
+ // Profile View
'profile_user_for_x' => 'User for :time',
'profile_created_content' => 'Created Content',
'profile_not_created_pages' => ':userName has not created any pages',
'profile_not_created_chapters' => ':userName has not created any chapters',
'profile_not_created_books' => ':userName has not created any books',
- /**
- * Comments
- */
+ // Comments
'comment' => 'Comment',
'comments' => 'Comments',
'comment_add' => 'Add Comment',
'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
'comment_in_reply_to' => 'In reply to :commentId',
- /**
- * Revision
- */
+ // Revision
'revision_delete_confirm' => 'Are you sure you want to delete this revision?',
'revision_delete_success' => 'Revision deleted',
'revision_cannot_delete_latest' => 'Cannot delete the latest revision.'
<?php
-
+/**
+ * Text shown in error messaging.
+ */
return [
- /**
- * Error text strings.
- */
-
// Permissions
'permission' => 'You do not have permission to access the requested page.',
'permissionJson' => 'You do not have permission to perform the requested action.',
'error_occurred' => 'An Error Occurred',
'app_down' => ':appName is down right now',
'back_soon' => 'It will be back up soon.',
+
];
<?php
-
+/**
+ * Pagination Language Lines
+ * The following language lines are used by the paginator library to build
+ * the simple pagination links.
+ */
return [
- /*
- |--------------------------------------------------------------------------
- | Pagination Language Lines
- |--------------------------------------------------------------------------
- |
- | The following language lines are used by the paginator library to build
- | the simple pagination links. You are free to change them to anything
- | you want to customize your views to better match your application.
- |
- */
-
'previous' => '« Previous',
'next' => 'Next »',
<?php
-
+/**
+ * Password Reminder Language Lines
+ * The following language lines are the default lines which match reasons
+ * that are given by the password broker for a password update attempt has failed.
+ */
return [
- /*
- |--------------------------------------------------------------------------
- | Password Reminder Language Lines
- |--------------------------------------------------------------------------
- |
- | The following language lines are the default lines which match reasons
- | that are given by the password broker for a password update attempt
- | has failed, such as for an invalid token or invalid new password.
- |
- */
-
'password' => 'Passwords must be at least six characters and match the confirmation.',
'user' => "We can't find a user with that e-mail address.",
'token' => 'This password reset token is invalid.',
<?php
-
+/**
+ * Settings text strings
+ * Contains all text strings used in the general settings sections of BookStack
+ * including users and roles.
+ */
return [
- /**
- * Settings text strings
- * Contains all text strings used in the general settings sections of BookStack
- * including users and roles.
- */
-
+ // Common Messages
'settings' => 'Settings',
'settings_save' => 'Save Settings',
'settings_save_success' => 'Settings saved',
- /**
- * App settings
- */
-
+ // App Settings
'app_settings' => 'App Settings',
'app_name' => 'Application name',
'app_name_desc' => 'This name is shown in the header and any emails.',
'app_disable_comments' => 'Disable comments',
'app_disable_comments_desc' => 'Disable comments across all pages in the application. Existing comments are not shown.',
- /**
- * Registration settings
- */
-
+ // Registration Settings
'reg_settings' => 'Registration Settings',
'reg_allow' => 'Allow registration?',
'reg_default_role' => 'Default user role after registration',
'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application. <br> Note that users will be able to change their email addresses after successful registration.',
'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
- /**
- * Maintenance settings
- */
-
+ // Maintenance settings
'maint' => 'Maintenance',
'maint_image_cleanup' => 'Cleanup Images',
'maint_image_cleanup_desc' => "Scans page & revision content to check which images and drawings are currently in use and which images are redundant. Ensure you create a full database and image backup before running this.",
'maint_image_cleanup_success' => ':count potentially unused images found and deleted!',
'maint_image_cleanup_nothing_found' => 'No unused images found, Nothing deleted!',
- /**
- * Role settings
- */
-
+ // Role Settings
'roles' => 'Roles',
'role_user_roles' => 'User Roles',
'role_create' => 'Create New Role',
'role_users' => 'Users in this role',
'role_users_none' => 'No users are currently assigned to this role',
- /**
- * Users
- */
-
+ // Users
'users' => 'Users',
'user_profile' => 'User Profile',
'users_add_new' => 'Add New User',
'users_social_connected' => ':socialAccount account was successfully attached to your profile.',
'users_social_disconnected' => ':socialAccount account was successfully disconnected from your profile.',
- // Since these labels are already localized this array does not need to be
- // translated in the language-specific files.
- // DELETE BELOW IF COPIED FROM EN
- ///////////////////////////////////
+ //! Since these labels are already localized this array does not need to be
+ //! translated in the language-specific files.
+ //! DELETE BELOW IF COPIED FROM EN
+ //!////////////////////////////////
'language_select' => [
'en' => 'English',
'ar' => 'العربية',
- 'de' => 'Deutsch',
+ 'de' => 'Deutsch (Sie)',
+ 'de_informal' => 'Deutsch (Du)',
'es' => 'Español',
'es_AR' => 'Español Argentina',
'fr' => 'Français',
'zh_CN' => '简体中文',
'zh_TW' => '繁體中文'
]
- ///////////////////////////////////
+ //!////////////////////////////////
];
<?php
-
+/**
+ * Validation Lines
+ * The following language lines contain the default error messages used by
+ * the validator class. Some of these rules have multiple versions such
+ * as the size rules. Feel free to tweak each of these messages here.
+ */
return [
- /*
- |--------------------------------------------------------------------------
- | Validation Language Lines
- |--------------------------------------------------------------------------
- |
- | The following language lines contain the default error messages used by
- | the validator class. Some of these rules have multiple versions such
- | as the size rules. Feel free to tweak each of these messages here.
- |
- */
-
+ // Standard laravel validation lines
'accepted' => 'The :attribute must be accepted.',
'active_url' => 'The :attribute is not a valid URL.',
'after' => 'The :attribute must be a date after :date.',
'unique' => 'The :attribute has already been taken.',
'url' => 'The :attribute format is invalid.',
- /*
- |--------------------------------------------------------------------------
- | Custom Validation Language Lines
- |--------------------------------------------------------------------------
- |
- | Here you may specify custom validation messages for attributes using the
- | convention "attribute.rule" to name the lines. This makes it quick to
- | specify a specific custom language line for a given attribute rule.
- |
- */
-
+ // Custom validation lines
'custom' => [
'password-confirm' => [
'required_with' => 'Password confirmation required',
],
],
- /*
- |--------------------------------------------------------------------------
- | Custom Validation Attributes
- |--------------------------------------------------------------------------
- |
- | The following language lines are used to swap attribute place-holders
- | with something more reader friendly such as E-Mail Address instead
- | of "email". This simply helps us make messages a little cleaner.
- |
- */
-
+ // Custom validation attributes
'attributes' => [],
-
];
--- /dev/null
+#!/usr/bin/env php
+<?php
+
+/**
+ * Format a language file in the same way as the EN equivalent.
+ * Matches the line numbers of translated content.
+ * Potentially destructive, Ensure you have a backup of your translation content before running.
+ */
+
+$args = array_slice($argv, 1);
+
+if (count($args) < 2) {
+ errorOut("Please provide a language code as the first argument and a translation file name, or '--all', as the second (./format.php fr activities)");
+}
+
+$lang = formatLocale($args[0]);
+$fileName = explode('.', $args[1])[0];
+$fileNames = [$fileName];
+if ($fileName === '--all') {
+ $fileNames = getTranslationFileNames();
+}
+
+foreach ($fileNames as $fileName) {
+ $formatted = formatFileContents($lang, $fileName);
+ writeLangFile($lang, $fileName, $formatted);
+}
+
+
+/**
+ * Format the contents of a single translation file in the given language.
+ * @param string $lang
+ * @param string $fileName
+ * @return string
+ */
+function formatFileContents(string $lang, string $fileName) : string {
+ $enLines = loadLangFileLines('en', $fileName);
+ $langContent = loadLang($lang, $fileName);
+ $enContent = loadLang('en', $fileName);
+
+ // Calculate the longest top-level key length
+ $longestKeyLength = calculateKeyPadding($enContent);
+
+ // Start formatted content
+ $formatted = [];
+ $mode = 'header';
+ $skipArray = false;
+ $arrayKeys = [];
+
+ foreach ($enLines as $index => $line) {
+ $trimLine = trim($line);
+ if ($mode === 'header') {
+ $formatted[$index] = $line;
+ if (str_replace(' ', '', $trimLine) === 'return[') $mode = 'body';
+ }
+
+ if ($mode === 'body') {
+ $matches = [];
+ $arrayEndMatch = preg_match('/]\s*,\s*$/', $trimLine);
+
+ if ($skipArray) {
+ if ($arrayEndMatch) $skipArray = false;
+ continue;
+ }
+
+ // Comment to ignore
+ if (strpos($trimLine, '//!') === 0) {
+ $formatted[$index] = "";
+ continue;
+ }
+
+ // Comment
+ if (strpos($trimLine, '//') === 0) {
+ $formatted[$index] = "\t" . $trimLine;
+ continue;
+ }
+
+ // Arrays
+ $arrayStartMatch = preg_match('/^\'(.*)\'\s+?=>\s+?\[(\],)?\s*?$/', $trimLine, $matches);
+
+ $indent = count($arrayKeys) + 1;
+ if ($arrayStartMatch === 1) {
+ if ($fileName === 'settings' && $matches[1] === 'language_select') {
+ $skipArray = true;
+ continue;
+ }
+ $arrayKeys[] = $matches[1];
+ $formatted[$index] = str_repeat(" ", $indent * 4) . str_pad("'{$matches[1]}'", $longestKeyLength) . "=> [";
+ if ($arrayEndMatch !== 1) continue;
+ }
+ if ($arrayEndMatch === 1) {
+ unsetArrayByKeys($langContent, $arrayKeys);
+ array_pop($arrayKeys);
+ if (isset($formatted[$index])) {
+ $formatted[$index] .= '],';
+ } else {
+ $formatted[$index] = str_repeat(" ", ($indent-1) * 4) . "],";
+ }
+ continue;
+ }
+
+ // Translation
+ $translationMatch = preg_match('/^\'(.*)\'\s+?=>\s+?[\'"](.*)?[\'"].+?$/', $trimLine, $matches);
+ if ($translationMatch === 1) {
+ $key = $matches[1];
+ $keys = array_merge($arrayKeys, [$key]);
+ $langVal = getTranslationByKeys($langContent, $keys);
+ if (empty($langVal)) continue;
+
+ $keyPad = $longestKeyLength;
+ if (count($arrayKeys) === 0) {
+ unset($langContent[$key]);
+ } else {
+ $keyPad = calculateKeyPadding(getTranslationByKeys($enContent, $arrayKeys));
+ }
+
+ $formatted[$index] = formatTranslationLine($key, $langVal, $indent, $keyPad);
+ continue;
+ }
+ }
+
+ }
+
+ // Fill missing lines
+ $arraySize = max(array_keys($formatted));
+ $formatted = array_replace(array_fill(0, $arraySize, ''), $formatted);
+
+ // Add remaining translations
+ $langContent = array_filter($langContent, function($item) {
+ return !is_null($item) && !empty($item);
+ });
+ if (count($langContent) > 0) {
+ $formatted[] = '';
+ $formatted[] = "\t// Unmatched";
+ }
+ foreach ($langContent as $key => $value) {
+ if (is_array($value)) {
+ $formatted[] = formatTranslationArray($key, $value);
+ } else {
+ $formatted[] = formatTranslationLine($key, $value);
+ }
+ }
+
+ // Add end line
+ $formatted[] = '];';
+ return implode("\n", $formatted);
+}
+
+/**
+ * Format a translation line.
+ * @param string $key
+ * @param string $value
+ * @param int $indent
+ * @param int $keyPad
+ * @return string
+ */
+function formatTranslationLine(string $key, string $value, int $indent = 1, int $keyPad = 1) : string {
+ $start = str_repeat(" ", $indent * 4) . str_pad("'{$key}'", $keyPad, ' ');
+ if (strpos($value, "\n") !== false) {
+ $escapedValue = '"' . str_replace("\n", '\n', $value) . '"';
+ $escapedValue = '"' . str_replace('"', '\"', $escapedValue) . '"';
+ } else {
+ $escapedValue = "'" . str_replace("'", "\\'", $value) . "'";
+ }
+ return "{$start} => {$escapedValue},";
+}
+
+/**
+ * Find the longest key in the array and provide the length
+ * for all keys to be used when printed.
+ * @param array $array
+ * @return int
+ */
+function calculateKeyPadding(array $array) : int {
+ $top = 0;
+ foreach ($array as $key => $value) {
+ $keyLen = strlen($key);
+ $top = max($top, $keyLen);
+ }
+ return min(35, $top + 2);
+}
+
+/**
+ * Format an translation array with the given key.
+ * Simply prints as an old-school php array.
+ * Used as a last-resort backup to save unused translations.
+ * @param string $key
+ * @param array $array
+ * @return string
+ */
+function formatTranslationArray(string $key, array $array) : string {
+ $arrayPHP = var_export($array, true);
+ return " '{$key}' => {$arrayPHP},";
+}
+
+/**
+ * Find a string translation value within a multi-dimensional array
+ * by traversing the given array of keys.
+ * @param array $translations
+ * @param array $keys
+ * @return string|array
+ */
+function getTranslationByKeys(array $translations, array $keys) {
+ $val = $translations;
+ foreach ($keys as $key) {
+ $val = $val[$key] ?? '';
+ if ($val === '') return '';
+ }
+ return $val;
+}
+
+/**
+ * Unset an inner item of a multi-dimensional array by
+ * traversing the given array of keys.
+ * @param array $input
+ * @param array $keys
+ */
+function unsetArrayByKeys(array &$input, array $keys) {
+ $val = &$input;
+ $lastIndex = count($keys) - 1;
+ foreach ($keys as $index => &$key) {
+ if ($index === $lastIndex && is_array($val)) {
+ unset($val[$key]);
+ }
+ if (!is_array($val)) return;
+ $val = &$val[$key] ?? [];
+ }
+}
+
+/**
+ * Write the given content to a translation file.
+ * @param string $lang
+ * @param string $fileName
+ * @param string $content
+ */
+function writeLangFile(string $lang, string $fileName, string $content) {
+ $path = __DIR__ . "/{$lang}/{$fileName}.php";
+ if (!file_exists($path)) {
+ errorOut("Expected translation file '{$path}' does not exist");
+ }
+ file_put_contents($path, $content);
+}
+
+/**
+ * Load the contents of a language file as an array of text lines.
+ * @param string $lang
+ * @param string $fileName
+ * @return array
+ */
+function loadLangFileLines(string $lang, string $fileName) : array {
+ $path = __DIR__ . "/{$lang}/{$fileName}.php";
+ if (!file_exists($path)) {
+ errorOut("Expected translation file '{$path}' does not exist");
+ }
+ $lines = explode("\n", file_get_contents($path));
+ return array_map(function($line) {
+ return trim($line, "\r");
+ }, $lines);
+}
+
+/**
+ * Load the contents of a language file
+ * @param string $lang
+ * @param string $fileName
+ * @return array
+ */
+function loadLang(string $lang, string $fileName) : array {
+ $path = __DIR__ . "/{$lang}/{$fileName}.php";
+ if (!file_exists($path)) {
+ errorOut("Expected translation file '{$path}' does not exist");
+ }
+
+ $fileData = include($path);
+ return $fileData;
+}
+
+/**
+ * Fetch an array containing the names of all translation files without the extension.
+ * @return array
+ */
+function getTranslationFileNames() : array {
+ $dir = __DIR__ . "/en";
+ if (!file_exists($dir)) {
+ errorOut("Expected directory '{$dir}' does not exist");
+ }
+ $files = scandir($dir);
+ $fileNames = [];
+ foreach ($files as $file) {
+ if (substr($file, -4) === '.php') {
+ $fileNames[] = substr($file, 0, strlen($file) - 4);
+ }
+ }
+ return $fileNames;
+}
+
+/**
+ * Format a locale to follow the lowercase_UPERCASE standard
+ * @param string $lang
+ * @return string
+ */
+function formatLocale(string $lang) : string {
+ $langParts = explode('_', strtoupper($lang));
+ $langParts[0] = strtolower($langParts[0]);
+ return implode('_', $langParts);
+}
+
+/**
+ * Dump a variable then die.
+ * @param $content
+ */
+function dd($content) {
+ print_r($content);
+ exit(1);
+}
+
+/**
+ * Log out some information text in blue
+ * @param $text
+ */
+function info($text) {
+ echo "\e[34m" . $text . "\e[0m\n";
+}
+
+/**
+ * Log out an error in red and exit.
+ * @param $text
+ */
+function errorOut($text) {
+ echo "\e[31m" . $text . "\e[0m\n";
+ exit(1);
+}
\ No newline at end of file
if (! empty($greeting)) {
echo $greeting, "\n\n";
-} else {
- echo $level == 'error' ? 'Whoops!' : 'Hello!', "\n\n";
}
if (! empty($introLines)) {
$this->mockUser = factory(User::class)->make();
}
+ protected function mockEscapes($times = 1)
+ {
+ $this->mockLdap->shouldReceive('escape')->times($times)->andReturnUsing(function($val) {
+ return ldap_escape($val);
+ });
+ }
+
+ protected function mockExplodes($times = 1)
+ {
+ $this->mockLdap->shouldReceive('explodeDn')->times($times)->andReturnUsing(function($dn, $withAttrib) {
+ return ldap_explode_dn($dn, $withAttrib);
+ });
+ }
+
public function test_login()
{
$this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
'dn' => ['dc=test' . config('services.ldap.base_dn')]
]]);
$this->mockLdap->shouldReceive('bind')->times(6)->andReturn(true);
+ $this->mockEscapes(4);
$this->visit('/login')
->see('Username')
'mail' => [$this->mockUser->email]
]]);
$this->mockLdap->shouldReceive('bind')->times(3)->andReturn(true);
+ $this->mockEscapes(2);
$this->visit('/login')
->see('Username')
'dn' => ['dc=test' . config('services.ldap.base_dn')]
]]);
$this->mockLdap->shouldReceive('bind')->times(3)->andReturn(true, true, false);
+ $this->mockEscapes(2);
$this->visit('/login')
->see('Username')
->dontSee('External Authentication');
}
- public function test_login_maps_roles_and_retains_existsing_roles()
+ public function test_login_maps_roles_and_retains_existing_roles()
{
$roleToReceive = factory(Role::class)->create(['name' => 'ldaptester', 'display_name' => 'LdapTester']);
$roleToReceive2 = factory(Role::class)->create(['name' => 'ldaptester-second', 'display_name' => 'LdapTester Second']);
]
]]);
$this->mockLdap->shouldReceive('bind')->times(6)->andReturn(true);
+ $this->mockEscapes(5);
+ $this->mockExplodes(6);
$this->visit('/login')
->see('Username')
]
]]);
$this->mockLdap->shouldReceive('bind')->times(5)->andReturn(true);
+ $this->mockEscapes(4);
+ $this->mockExplodes(2);
$this->visit('/login')
->see('Username')
]
]]);
$this->mockLdap->shouldReceive('bind')->times(5)->andReturn(true);
+ $this->mockEscapes(4);
+ $this->mockExplodes(2);
$this->visit('/login')
->see('Username')
]
]]);
$this->mockLdap->shouldReceive('bind')->times(6)->andReturn(true);
+ $this->mockEscapes(5);
+ $this->mockExplodes(6);
$this->visit('/login')
->see('Username')
public function setUp()
{
parent::setUp();
- $this->langs = array_diff(scandir(resource_path('lang')), ['..', '.', 'check.php']);
+ $this->langs = array_diff(scandir(resource_path('lang')), ['..', '.', 'check.php', 'format.php']);
}
public function test_locales_config_key_set_properly()
$this->assertTrue(config('app.rtl'), "App RTL config should have been set to true by middleware");
}
+ public function test_de_informal_falls_base_to_de()
+ {
+ // Base de back value
+ $deBack = trans()->get('common.cancel', [], 'de', false);
+ $this->assertEquals('Abbrechen', $deBack);
+ // Ensure de_informal has no value set
+ $this->assertEquals('common.cancel', trans()->get('common.cancel', [], 'de_informal', false));
+ // Ensure standard trans falls back to de
+ $this->assertEquals($deBack, trans('common.cancel', [], 'de_informal'));
+ // Ensure de_informal gets its own values where set
+ $deEmailActionHelp = trans()->get('common.email_action_help', [], 'de', false);
+ $enEmailActionHelp = trans()->get('common.email_action_help', [], 'en', false);
+ $deInformalEmailActionHelp = trans()->get('common.email_action_help', [], 'de_informal', false);
+ $this->assertNotEquals($deEmailActionHelp, $deInformalEmailActionHelp);
+ $this->assertNotEquals($enEmailActionHelp, $deInformalEmailActionHelp);
+ }
+
+ public function test_de_informal_falls_base_to_de_in_js_endpoint()
+ {
+ $this->asEditor();
+ setting()->putUser($this->getEditor(), 'language', 'de_informal');
+
+ $transResp = $this->get('/translations');
+ $transResp->assertSee('"cancel":"Abbrechen"');
+ }
+
}
\ No newline at end of file
projects / bookstack / commitdiff