Merge pull request #231 from Fred89/master

French lang pack update + Little Bludit lang forget fix
This commit is contained in:
Diego Najar 2016-02-13 12:44:02 -03:00
commit ea668451f5
4 changed files with 251 additions and 231 deletions

3
bl-kernel/admin/themes/default/init.php Normal file → Executable file
View File

@ -70,6 +70,7 @@ class HTML {
public static function tags($args) public static function tags($args)
{ {
global $L;
// Javascript code // Javascript code
include(PATH_JS.'bludit-tags.js'); include(PATH_JS.'bludit-tags.js');
@ -81,7 +82,7 @@ class HTML {
$html .= '<div class="uk-form-controls">'; $html .= '<div class="uk-form-controls">';
$html .= '<input id="jstagInput" type="text" class="uk-width-1-2" autocomplete="off">'; $html .= '<input id="jstagInput" type="text" class="uk-width-1-2" autocomplete="off">';
$html .= '<button id="jstagAdd" class="uk-button">Add</button>'; $html .= '<button id="jstagAdd" class="uk-button">'.$L->g('Add').'</button>';
$html .= '<div id="jstagList">'; $html .= '<div id="jstagList">';

12
bl-kernel/admin/views/edit-user.php Normal file → Executable file
View File

@ -47,7 +47,7 @@ HTML::formOpen(array('id'=>'edit-user-profile-form','class'=>'uk-form-horizontal
)); ));
echo '<div class="uk-form-row"> echo '<div class="uk-form-row">
<label class="uk-form-label">Password</label> <label class="uk-form-label">'.$L->g('password').'</label>
<div class="uk-form-controls"> <div class="uk-form-controls">
<a href="'.HTML_PATH_ADMIN_ROOT.'user-password/'.$_User->username().'">'.$L->g('Change password').'</a> <a href="'.HTML_PATH_ADMIN_ROOT.'user-password/'.$_User->username().'">'.$L->g('Change password').'</a>
</div> </div>
@ -72,11 +72,11 @@ if($Login->role()==='admin') {
'tip'=>$L->g('email-will-not-be-publicly-displayed') 'tip'=>$L->g('email-will-not-be-publicly-displayed')
)); ));
HTML::legend(array('value'=>'Social networks')); HTML::legend(array('value'=>$L->g('Social networks')));
HTML::formInputText(array( HTML::formInputText(array(
'name'=>'twitterUsername', 'name'=>'twitterUsername',
'label'=>'Twitter username', 'label'=>$L->g('Twitter username'),
'value'=>$_User->twitterUsername(), 'value'=>$_User->twitterUsername(),
'class'=>'uk-width-1-2 uk-form-medium', 'class'=>'uk-width-1-2 uk-form-medium',
'tip'=>'' 'tip'=>''
@ -84,7 +84,7 @@ if($Login->role()==='admin') {
HTML::formInputText(array( HTML::formInputText(array(
'name'=>'facebookUsername', 'name'=>'facebookUsername',
'label'=>'Facebook username', 'label'=>$L->g('Facebook username'),
'value'=>$_User->facebookUsername(), 'value'=>$_User->facebookUsername(),
'class'=>'uk-width-1-2 uk-form-medium', 'class'=>'uk-width-1-2 uk-form-medium',
'tip'=>'' 'tip'=>''
@ -92,7 +92,7 @@ if($Login->role()==='admin') {
HTML::formInputText(array( HTML::formInputText(array(
'name'=>'googleUsername', 'name'=>'googleUsername',
'label'=>'Google username', 'label'=>$L->g('Google username'),
'value'=>$_User->googleUsername(), 'value'=>$_User->googleUsername(),
'class'=>'uk-width-1-2 uk-form-medium', 'class'=>'uk-width-1-2 uk-form-medium',
'tip'=>'' 'tip'=>''
@ -100,7 +100,7 @@ if($Login->role()==='admin') {
HTML::formInputText(array( HTML::formInputText(array(
'name'=>'instagramUsername', 'name'=>'instagramUsername',
'label'=>'Instagram username', 'label'=>$L->g('Instagram username'),
'value'=>$_User->instagramUsername(), 'value'=>$_User->instagramUsername(),
'class'=>'uk-width-1-2 uk-form-medium', 'class'=>'uk-width-1-2 uk-form-medium',
'tip'=>'' 'tip'=>''

11
bl-languages/en_US.json Normal file → Executable file
View File

@ -37,7 +37,7 @@
"draft": "Draft", "draft": "Draft",
"delete": "Delete", "delete": "Delete",
"registered": "Registered", "registered": "Registered",
"Notifications": "Notifications", "notifications": "Notifications",
"profile": "Profile", "profile": "Profile",
"email": "Email", "email": "Email",
"settings": "Settings", "settings": "Settings",
@ -226,11 +226,18 @@
"click-here-to-cancel": "Click here to cancel.", "click-here-to-cancel": "Click here to cancel.",
"type-the-tag-and-press-enter": "Type the tag and press enter.", "type-the-tag-and-press-enter": "Type the tag and press enter.",
"add": "Add",
"manage-your-bludit-from-the-admin-panel": "Manage your Bludit from the [admin area]({{ADMIN_AREA_LINK}})", "manage-your-bludit-from-the-admin-panel": "Manage your Bludit from the [admin area]({{ADMIN_AREA_LINK}})",
"there-are-no-images":"There are no images", "there-are-no-images":"There are no images",
"click-on-the-image-for-options": "Click on the image for options.", "click-on-the-image-for-options": "Click on the image for options.",
"set-as-cover-image": "Set as cover image", "set-as-cover-image": "Set as cover image",
"delete-image": "Delete image", "delete-image": "Delete image",
"image-description": "Image description" "image-description": "Image description",
"social-networks": "Social networks",
"twitter-username": "Twitter username",
"facebook-username": "Facebook username",
"google-username": "Google username",
"instagram-username": "Instagram username"
} }

20
bl-languages/fr_FR.json Normal file → Executable file
View File

@ -3,10 +3,10 @@
{ {
"native": "Français (France)", "native": "Français (France)",
"english-name": "French", "english-name": "French",
"last-update": "2016-01-19", "last-update": "2016-02-13",
"author": "Frédéric K.", "author": "Frédéric K.",
"email": "stradfred@gmail.com", "email": "stradfred@gmail.com",
"website": "" "website": "http://flatboard.co.nf"
}, },
"username": "Nom dutilisateur", "username": "Nom dutilisateur",
@ -37,7 +37,7 @@
"draft": "Brouillon", "draft": "Brouillon",
"delete": "Supprimer", "delete": "Supprimer",
"registered": "Inscrit", "registered": "Inscrit",
"Notifications": "Notifications", "notifications": "Notifications",
"profile": "Profil", "profile": "Profil",
"email": "E-mail", "email": "E-mail",
"settings": "Paramètres", "settings": "Paramètres",
@ -226,6 +226,18 @@
"double-click-on-the-image-to-add-it": "Double-cliquez sur limage pour lajouter.", "double-click-on-the-image-to-add-it": "Double-cliquez sur limage pour lajouter.",
"click-here-to-cancel": "Cliquez ici pour annuler.", "click-here-to-cancel": "Cliquez ici pour annuler.",
"type-the-tag-and-press-enter": "Saisissez le tag et appuyez sur Entrée.", "type-the-tag-and-press-enter": "Saisissez le tag et appuyez sur Entrée.",
"add": "Ajouter",
"manage-your-bludit-from-the-admin-panel": "Gérez votre Bludit depuis [linterface dadministration]({{ADMIN_AREA_LINK}})", "manage-your-bludit-from-the-admin-panel": "Gérez votre Bludit depuis [linterface dadministration]({{ADMIN_AREA_LINK}})",
"there-are-no-images":"Il ny a aucune image" "there-are-no-images":"Il ny a aucune image",
"click-on-the-image-for-options": "Cliquez sur limage pour plus doptions.",
"set-as-cover-image": "Définir comme image de couverture",
"delete-image": "Supprimer limage",
"image-description": "Description de limage",
"social-networks": "Réseaux sociaux",
"twitter-username": "Compte utilisateur Twitter",
"facebook-username": "Compte utilisateur Facebook",
"google-username": "Compte utilisateur Google",
"instagram-username": "Compte utilisateur Instagram"
} }