diff --git a/.htaccess b/.htaccess
index 8460cb16..407df643 100644
--- a/.htaccess
+++ b/.htaccess
@@ -15,4 +15,4 @@ RewriteRule ^bl-content/(.*)\.txt$ - [R=404,L]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^(.*) index.php [PT,L]
-
+
\ No newline at end of file
diff --git a/bl-kernel/admin/themes/booty/html/user-logged.php b/bl-kernel/admin/themes/booty/html/user-logged.php
index efd815f7..d969c19f 100644
--- a/bl-kernel/admin/themes/booty/html/user-logged.php
+++ b/bl-kernel/admin/themes/booty/html/user-logged.php
@@ -1,8 +1,11 @@
-
+ -->
diff --git a/bl-kernel/admin/views/categories.php b/bl-kernel/admin/views/categories.php
index c74922ff..9ee18654 100644
--- a/bl-kernel/admin/views/categories.php
+++ b/bl-kernel/admin/views/categories.php
@@ -3,7 +3,7 @@
echo Bootstrap::pageTitle(array('title'=>$L->g('Categories'), 'icon'=>'tags'));
echo Bootstrap::link(array(
- 'title'=>'Add a new category',
+ 'title'=>$L->g('Add a new category'),
'href'=>HTML_PATH_ADMIN_ROOT.'new-category',
'icon'=>'plus'
));
@@ -12,8 +12,8 @@ echo '
- Name |
- URL |
+ '.$L->g('Name').' |
+ '.$L->g('URL').' |
diff --git a/bl-kernel/admin/views/dashboard.php b/bl-kernel/admin/views/dashboard.php
index e270fa0b..2e09aade 100644
--- a/bl-kernel/admin/views/dashboard.php
+++ b/bl-kernel/admin/views/dashboard.php
@@ -4,24 +4,24 @@
-
Quick links
+
p('Quick links') ?>
@@ -31,19 +31,19 @@
@@ -55,7 +55,7 @@
- Notifications
+ p('Notifications') ?>
db, 0, NOTIFICATIONS_AMOUNT);
foreach ($logs as $log) {
@@ -67,7 +67,7 @@
}
echo '
';
echo Date::format($log['date'], DB_DATE_FORMAT, NOTIFICATIONS_DATE_FORMAT);
- echo ' - by '.$log['username'];
+ echo ' [ '.$log['username'] .' ]';
echo '';
echo '';
}
diff --git a/bl-kernel/admin/views/new-category.php b/bl-kernel/admin/views/new-category.php
index e5ce1dfd..72b08233 100644
--- a/bl-kernel/admin/views/new-category.php
+++ b/bl-kernel/admin/views/new-category.php
@@ -11,7 +11,7 @@ echo Bootstrap::formOpen(array());
echo Bootstrap::formInputTextBlock(array(
'name'=>'category',
- 'label'=>$L->g('Category name'),
+ 'label'=>$L->g('Name'),
'value'=>isset($_POST['category'])?$_POST['category']:'',
'class'=>'',
'placeholder'=>'',
@@ -20,8 +20,8 @@ echo Bootstrap::formOpen(array());
echo '
';
diff --git a/bl-kernel/admin/views/new-content.php b/bl-kernel/admin/views/new-content.php
index 64b5fb59..bf62d2e3 100644
--- a/bl-kernel/admin/views/new-content.php
+++ b/bl-kernel/admin/views/new-content.php
@@ -176,7 +176,7 @@
'tip'=>$L->g('Write a template name to filter the page in the theme and change the style of the page.')
));
- echo Bootstrap::formTitle(array('title'=>'SEO'));
+ echo Bootstrap::formTitle(array('title'=>$L->g('SEO')));
// Tags
echo Bootstrap::formInputText(array(
@@ -191,7 +191,7 @@
'name'=>'slug',
'tip'=>$L->g('URL associated with the content'),
'label'=>$L->g('Friendly URL'),
- 'placeholder'=>'Leave empty for autocomplete by Bludit.'
+ 'placeholder'=>$L->g('Leave empty for autocomplete by Bludit.')
));
echo Bootstrap::formCheckbox(array(
diff --git a/bl-kernel/admin/views/settings.php b/bl-kernel/admin/views/settings.php
index f9fc66e7..8db45576 100644
--- a/bl-kernel/admin/views/settings.php
+++ b/bl-kernel/admin/views/settings.php
@@ -7,19 +7,19 @@ echo Bootstrap::pageTitle(array('title'=>$L->g('Settings'), 'icon'=>'cog'));
db[$key];
}
- $line = '"'.$key.'": "'.$string.'",';
- file_put_contents(DEBUG_FILE, $line.PHP_EOL, FILE_APPEND);
+ //$line = '"'.$key.'": "'.$string.'",';
+ //file_put_contents(DEBUG_FILE, $line.PHP_EOL, FILE_APPEND);
return $string;
}
diff --git a/bl-languages/en.json b/bl-languages/en.json
index d831f4a3..011e8273 100644
--- a/bl-languages/en.json
+++ b/bl-languages/en.json
@@ -342,5 +342,12 @@
"allow-unicode-characters-in-the-url-and-some-part-of-the-system": "Allow Unicode characters in the URL and some part of the system.",
"variables-allowed": "Variables allowed",
"tag": "Tag",
- "drag-and-drop-to-sort-the-plugins": "Drag and Drop to sort the plugins."
+ "drag-and-drop-to-sort-the-plugins": "Drag and Drop to sort the plugins.",
+ "seo": "SEO",
+ "documentation": "Documentation",
+ "forum-support": "Forum support",
+ "chat-support": "Chat support",
+ "quick-links": "Quick links",
+ "leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
+ "choose-a-password-for-the-user-admin": "Choose a password for the user admin
"
}
\ No newline at end of file
diff --git a/bl-languages/es.json b/bl-languages/es.json
index 48941a28..89478391 100644
--- a/bl-languages/es.json
+++ b/bl-languages/es.json
@@ -307,7 +307,7 @@
"social-networks": "Redes sociales",
"interval": "Intervalo",
"number-in-minutes-for-every-execution-of-autosave": "Número en minutos para cada ejecución de Autoguardar.",
- "extreme-friendly-url": "Extreme friendly URL",
+ "extreme-friendly-url": "URL amistosas",
"title-formats": "Formatos de los títulos",
"delete-content": "Eliminar contenido",
"are-you-sure-you-want-to-delete-this-page": "¿Confirma que desea eliminar esta página?",
@@ -340,5 +340,11 @@
"allow-unicode-characters-in-the-url-and-some-part-of-the-system": "Permitir caracteres Unicode en la dirección URL y en alguna parte del sistema.",
"variables-allowed": "Variables permitidas",
"tag": "Etiqueta",
- "drag-and-drop-to-sort-the-plugins": "Arrastrar y soltar para ordenar los plugins."
+ "drag-and-drop-to-sort-the-plugins": "Arrastrar y soltar para ordenar los plugins.",
+ "seo": "SEO",
+ "documentation": "Documentation",
+ "forum-support": "Forum support",
+ "chat-support": "Chat support",
+ "quick-links": "Enlaces rápidos",
+ "leave-empty-for-autocomplete-by-bludit": "Deje vacío para ser autocompletado por Bludit."
}
\ No newline at end of file
diff --git a/bl-plugins/rss/plugin.php b/bl-plugins/rss/plugin.php
index 283c9125..504227c1 100644
--- a/bl-plugins/rss/plugin.php
+++ b/bl-plugins/rss/plugin.php
@@ -49,7 +49,7 @@ class pluginRSS extends Plugin {
$onlyPublished = true;
// Get the list of pages
- $list = $pages->getList($pageNumber, $numberOfItems, $onlyPublished, true);
+ $list = $pages->getList($pageNumber, $numberOfItems, $onlyPublished);
$xml = '';
$xml .= '';
diff --git a/bl-plugins/simple-stats/languages/en.json b/bl-plugins/simple-stats/languages/en.json
index 3db5c5ea..490d7226 100644
--- a/bl-plugins/simple-stats/languages/en.json
+++ b/bl-plugins/simple-stats/languages/en.json
@@ -3,5 +3,8 @@
{
"name": "Simple Stats",
"description": "Show the number of visitors per day on your dashboard."
- }
+ },
+ "visits": "Visits",
+ "visits-today": "Visits today",
+ "unique-visitors-today": "Unique visitors today"
}
\ No newline at end of file
diff --git a/bl-plugins/simple-stats/languages/es.json b/bl-plugins/simple-stats/languages/es.json
index c60ea79c..6185e7b1 100644
--- a/bl-plugins/simple-stats/languages/es.json
+++ b/bl-plugins/simple-stats/languages/es.json
@@ -3,5 +3,8 @@
{
"name": "Simple Stats",
"description": "Muestra el número de visitantes por día en tu panel."
- }
+ },
+ "visits": "Visitas",
+ "visits-today": "Visitas de hoy",
+ "unique-visitors-today": "Visitantes únicos de hoy"
}
\ No newline at end of file
diff --git a/bl-plugins/simple-stats/plugin.php b/bl-plugins/simple-stats/plugin.php
index 050935a3..0f3663eb 100644
--- a/bl-plugins/simple-stats/plugin.php
+++ b/bl-plugins/simple-stats/plugin.php
@@ -10,9 +10,11 @@ class pluginSimpleStats extends Plugin {
public function init()
{
+ global $L;
+
// Fields and default values for the database of this plugin
$this->dbFields = array(
- 'label'=>'Visits',
+ 'label'=>$L->g('Visits'),
'numberOfDays'=>7,
'excludeAdmins'=>false
);
@@ -63,6 +65,7 @@ class pluginSimpleStats extends Plugin {
public function dashboard()
{
+ global $L;
$label = $this->getValue('label');
$currentDate = Date::current('Y-m-d');
$visitsToday = $this->visits($currentDate);
@@ -75,8 +78,8 @@ $html = <<
-
Visits today: $visitsToday
-
Unique visitors today: $uniqueVisitors
+
{$L->g('Visits today')}: $visitsToday
+
{$L->g('Unique visitors today')}: $uniqueVisitors
diff --git a/install.php b/install.php
index 0817879f..af6fb979 100644
--- a/install.php
+++ b/install.php
@@ -155,7 +155,7 @@ foreach ($languageFiles as $fname=>$native) {
}
}
-$language = new Language($finalLanguage);
+$L = $language = new Language($finalLanguage);
// Set locale
setlocale(LC_ALL, $localeFromHTTP);
@@ -591,7 +591,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
elseif (isset($_GET['language']))
{
?>
- get('Choose a password for the username admin') ?>
+ get('choose-a-password-for-the-user-admin') ?>