Language fixes

bl-languages/en.json

@@ -154,5 +154,18 @@
 	"returning-page-when-the-page-doesnt-exist": "Returning page when the page doesn't exist, leave blank if you want to returns a default message.",
 	"returning-page-for-the-main-page": "Returning page for the main page, leave blank if you want to show all the pages on the main page.",
 	"full-url-of-your-site": "Full URL of your site. Complete with the protocol HTTP or HTTPS (only if you have enabled SSL on your server).",
-	"with-the-locales-you-can-set-the-regional-user-interface": "With the locales, you can set the regional user interface, such as the dates in your language. The locales need to be installed on your system."
+	"with-the-locales-you-can-set-the-regional-user-interface": "With the locales, you can set the regional user interface, such as the dates in your language. The locales need to be installed on your system.",
+	"bludit-installer": "Bludit Installer",
+	"choose-your-language": "Choose your language",
+	"next": "Next",
+	"complete-the-form-choose-a-password-for-the-username-admin": "Complete the form choose a password for the username <b>< admin ></b>",
+	"show-password": "Show password",
+	"install": "Install",
+	"whats-next": "What's Next",
+	"follow-bludit-on": "Follow Bludit on",
+	"visit-the-forum-for-support": "Visit the [forum](https://forum.bludit.org) for support",
+	"manage-your-bludit-from-the-admin-panel": "Manage your Bludit from the [admin area]({{ADMIN_AREA_LINK}})",
+	"chat-with-developers-and-users-on-gitter":"Chat with developers and users on [Gitter](https://gitter.im/dignajar/bludit)",
+	"this-is-a-brief-description-of-yourself-our-your-site":"This is a brief description of yourself or your site, to change this text go to the admin panel, settings, plugins, and configure the plugin about.",
+	"read-the-documentation-for-more-information": "Read the [documentation](https://docs.bludit.com) for more information"
 }

bl-languages/en_US.json

@@ -1,278 +0,0 @@
-{
-	"language-data":
-	{
-		"native": "English (United States)",
-		"english-name": "English",
-		"last-update": "2016-02-13",
-		"author": "Diego",
-		"email": "",
-		"website": ""
-	},
-
-	"installer-page-about-content": "The about page is an important and powerful tool for potential clients and partners. For those who wonder who is behind the website, your About page is the first source of information. \n Change this page's content on the admin panel, manage, pages and click on the about page.",
-	"installer-page-error-content": "Opps, page not found, sorry!",
-	"page-not-found": "Page not found",
-	"about-your-site-or-yourself": "About your site or yourself",
-	"welcome-to-bludit": "Welcome to Bludit",
-
-	"username": "Username",
-	"password": "Password",
-	"confirm-password": "Confirm Password",
-	"editor": "Editor",
-	"dashboard": "Dashboard",
-	"role": "Role",
-	"post": "Post",
-	"posts": "Posts",
-	"users": "Users",
-	"administrator": "Administrator",
-	"add": "Add",
-	"cancel": "Cancel",
-	"content": "Content",
-	"title": "Title",
-	"no-parent": "No parent",
-	"edit-page": "Edit page",
-	"edit-post": "Edit post",
-	"add-a-new-user": "Add a new user",
-	"parent": "Parent",
-	"friendly-url": "Friendly URL",
-	"description": "Description",
-	"posted-by": "Posted by",
-	"tags": "Tags",
-	"position": "Position",
-	"save": "Save",
-	"draft": "Draft",
-	"delete": "Delete",
-	"registered": "Registered",
-	"notifications": "Notifications",
-	"profile": "Profile",
-	"email": "Email",
-	"settings": "Settings",
-	"general": "General",
-	"advanced": "Advanced",
-	"regional": "Regional",
-	"about": "About",
-	"login": "Log in",
-	"logout": "Log out",
-	"manage": "Manage",
-	"themes": "Themes",
-	"prev-page": "Prev page",
-	"next-page": "Next page",
-	"first-page": "First page",
-	"last-page": "Last page",
-	"configure-plugin": "Configure plugin",
-	"confirm-delete-this-action-cannot-be-undone": "Confirm delete, this action cannot be undone.",
-	"site-title": "Site title",
-	"site-slogan": "Site slogan",
-	"site-description": "Site description",
-	"footer-text": "Footer text",
-	"posts-per-page": "Posts per page",
-	"site-url": "Site url",
-	"writting-settings": "Writting settings",
-	"url-filters": "URL filters",
-	"page": "Page",
-	"pages": "Pages",
-	"home": "Home",
-	"welcome-back": "Welcome back",
-	"language": "Language",
-	"website": "Website",
-	"timezone": "Timezone",
-	"locale": "Locale",
-	"new-post": "New post",
-	"new-page": "New page",
-	"html-and-markdown-code-supported": "HTML and Markdown code supported",
-	"manage-posts": "Manage posts",
-	"published-date": "Published date",
-	"modified-date": "Modified date",
-	"empty-title": "Empty title",
-	"plugins": "Plugins",
-	"install-plugin": "Install plugin",
-	"uninstall-plugin": "Uninstall plugin",
-	"new-password": "New password",
-	"edit-user": "Edit user",
-	"publish-now": "Publish now",
-	"first-name": "First name",
-	"last-name": "Last name",
-	"bludit-version": "Bludit version",
-	"powered-by": "Powered by",
-	"recent-posts": "Recent Posts",
-	"manage-pages": "Manage pages",
-	"advanced-options": "Advanced options",
-	"user-deleted": "User deleted",
-	"page-added-successfully": "Page added successfully",
-	"post-added-successfully": "Post added successfully",
-	"the-post-has-been-deleted-successfully": "The post has been deleted successfully",
-	"the-page-has-been-deleted-successfully": "The page has been deleted successfully",
-	"username-or-password-incorrect": "Username or password incorrect",
-	"database-regenerated": "Database regenerated",
-	"the-changes-have-been-saved": "The changes have been saved",
-	"enable-more-features-at": "Enable more features at",
-	"username-already-exists": "Username already exists",
-	"username-field-is-empty": "Username field is empty",
-	"the-password-and-confirmation-password-do-not-match":"The password and confirmation password do not match",
-	"user-has-been-added-successfully": "User has been added successfully",
-	"you-do-not-have-sufficient-permissions": "You do not have sufficient permissions to access this page, contact the administrator.",
-	"settings-advanced-writting-settings": "Settings->Advanced->Writting Settings",
-	"new-posts-and-pages-synchronized": "New posts and pages synchronized.",
-	"you-can-choose-the-users-privilege": "You can choose the user's privilege. The editor role only can write pages and posts.",
-	"email-will-not-be-publicly-displayed": "Email will not be publicly displayed. Recommended for recovery password and notifications.",
-	"use-this-field-to-name-your-site": "Use this field to name your site, it will appear at the top of every page of your site.",
-	"use-this-field-to-add-a-catchy-phrase": "Use this field to add a catchy phrase on your site.",
-	"you-can-add-a-site-description-to-provide": "You can add a site description to provide a short bio or description of your site.",
-	"you-can-add-a-small-text-on-the-bottom": "You can add a small text on the bottom of every page. eg: copyright, owner, dates, etc.",
-	"number-of-posts-to-show-per-page": "Number of posts to show per page.",
-	"the-url-of-your-site": "The URL of your site.",
-	"add-or-edit-description-tags-or": "Add or edit description, tags or modify the friendly URL.",
-	"select-your-sites-language": "Select your site's language.",
-	"select-a-timezone-for-a-correct": "Select a timezone for a correct date/time display on your site.",
-	"you-can-use-this-field-to-define-a-set-of": "You can use this field to define a set of parameters related to the language, country and special preferences.",
-	"you-can-modify-the-url-which-identifies":"You can modify the URL which identifies a page or post using human-readable keywords. No more than 150 characters.",
-	"this-field-can-help-describe-the-content": "This field can help describe the content in a few words. No more than 150 characters.",
-
-	"delete-the-user-and-all-its-posts":"Delete the user and all its posts",
-	"delete-the-user-and-associate-its-posts-to-admin-user": "Delete the user and associate its posts to admin user",
-	"read-more": "Read more",
-	"show-blog": "Show blog",
-	"default-home-page": "Default home page",
-	"version": "Version",
-	"there-are-no-drafts": "There are no drafts.",
-	"create-a-new-article-for-your-blog":"Create a new article for your blog.",
-	"create-a-new-page-for-your-website":"Create a new page for your website.",
-	"invite-a-friend-to-collaborate-on-your-website":"Invite a friend to collaborate on your website.",
-	"change-your-language-and-region-settings":"Change your language and region settings.",
-	"language-and-timezone":"Language and timezone",
-	"author": "Author",
-	"start-here": "Start here",
-	"install-theme": "Install theme",
-	"first-post": "First post",
-	"congratulations-you-have-successfully-installed-your-bludit": "Congratulations you have successfully installed your **Bludit**",
-	"whats-next": "What's Next",
-
-	"follow-bludit-on": "Follow Bludit on",
-	"visit-the-support-forum": "Visit the [forum](https://forum.bludit.com) for support",
-	"read-the-documentation-for-more-information": "Read the [documentation](https://docs.bludit.com) for more information",
-	"share-with-your-friends-and-enjoy": "Share with your friends and enjoy",
-	"the-page-has-not-been-found": "The page has not been found.",
-	"error": "Error",
-	"bludit-installer": "Bludit Installer",
-	"welcome-to-the-bludit-installer": "Welcome to the Bludit installer",
-	"complete-the-form-choose-a-password-for-the-username-admin": "Complete the form, choose a password for the username « admin »",
-	"password-visible-field": "Password, visible field!",
-	"install": "Install",
-	"choose-your-language": "Choose your language",
-	"next": "Next",
-	"the-password-field-is-empty": "The password field is empty",
-	"your-email-address-is-invalid":"Your email address is invalid.",
-	"proceed-anyway": "Proceed anyway!",
-	"drafts":"Drafts",
-	"ip-address-has-been-blocked": "IP address has been blocked.",
-	"try-again-in-a-few-minutes": "Try again in a few minutes.",
-	"date": "Date",
-
-	"scheduled": "Scheduled",
-	"publish": "Publish",
-	"please-check-your-theme-configuration": "Please check your theme configuration.",
-	"plugin-label": "Plugin label",
-	"enabled": "Enabled",
-	"disabled": "Disabled",
-	"cli-mode": "Cli mode",
-	"command-line-mode": "Command line mode",
-	"enable-the-command-line-mode-if-you-add-edit": "Enable the command line mode if you add, edit or remove posts and pages from the filesystem",
-
-	"configure": "Configure",
-	"uninstall": "Uninstall",
-	"change-password": "Change password",
-	"to-schedule-the-post-just-select-the-date-and-time": "To schedule the post, just select the date and time.",
-	"write-the-tags-separated-by-commas": "Write the tags separated by commas.",
-	"status": "Status",
-	"published": "Published",
-	"scheduled-posts": "Scheduled posts",
-	"statistics": "Statistics",
-	"name": "Name",
-	"email-account-settings":"Email account settings",
-	"sender-email": "Sender email",
-	"emails-will-be-sent-from-this-address":"Emails will be sent from this address.",
-	"bludit-login-access-code": "BLUDIT - Login access code",
-	"check-your-inbox-for-your-login-access-code":"Check your inbox for your login access code",
-	"there-was-a-problem-sending-the-email":"There was a problem sending the email",
-	"back-to-login-form": "Back to login form",
-	"send-me-a-login-access-code": "Send me a login access code",
-	"get-login-access-code": "Get login access code",
-	"email-notification-login-access-code": "<p>This is a notification from your website {{WEBSITE_NAME}}</p><p>You request a login access code, follow the next link:</p><p>{{LINK}}</p>",
-	"there-are-no-scheduled-posts": "There are no scheduled posts.",
-	"show-password": "Show password",
-	"edit-or-remove-your=pages": "Edit or remove your pages.",
-	"edit-or-remove-your-blogs-posts": "Edit or remove your blog's posts.",
-	"general-settings": "General settings",
-	"advanced-settings": "Advanced settings",
-	"manage-users": "Manage users",
-	"view-and-edit-your-profile": "View and edit your profile.",
-
-	"password-must-be-at-least-6-characters-long": "Password must be at least 6 characters long",
-	"images": "Images",
-	"upload-image": "Upload image",
-	"drag-and-drop-or-click-here": "Drag and drop or click here",
-	"insert-image": "Insert image",
-	"supported-image-file-types": "Supported image file types",
-	"date-format": "Date format",
-	"time-format": "Time format",
-	"chat-with-developers-and-users-on-gitter":"Chat with developers and users on [Gitter](https://gitter.im/dignajar/bludit)",
-	"this-is-a-brief-description-of-yourself-our-your-site":"This is a brief description of yourself or your site, to change this text go to the admin panel, settings, plugins, and configure the plugin about.",
-	"profile-picture": "Profile picture",
-	"the-about-page-is-very-important": "The about page is an important and powerful tool for potential clients and partners. For those who wonder who is behind the website, your About page is the first source of information.",
-	"change-this-pages-content-on-the-admin-panel": "Change this page's content on the admin panel, manage, pages and click on the about page.",
-	"about-your-site-or-yourself": "About your site or yourself",
-
-
-	"site-information": "Site information",
-	"date-and-time-formats": "Date and time formats",
-	"activate": "Activate",
-	"deactivate": "Deactivate",
-
-	"cover-image": "Cover image",
-	"blog": "Blog",
-	"more-images": "More images",
-
-	"click-here-to-cancel": "Click here to cancel.",
-	"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}})",
-	"there-are-no-images":"There are no images",
-
-	"click-on-the-image-for-options": "Click on the image for options.",
-	"set-as-cover-image": "Set as cover image",
-	"delete-image": "Delete image",
-	"image-description": "Image description",
-
-	"social-networks-links": "Social networks links",
-
-	"email-access-code": "Email access code",
-	"current-format": "Current format",
-
-	"welcome": "Welcome",
-
-	"to-enable-the-user-you-have-to-set-a-new-password": "To enable the user you have to set a new password.",
-	"do-you-want-to-disable-the-user": "Do you want to disable the user ?",
-	"сurrent-status" : "Status",
-	"disable-the-user" : "Disable the user",
-	"add-a-new-page": "Add a new page",
-	"add-a-new-post": "Add a new post",
-
-	"save-as-draft": "Save as draft",
-	"categories": "Сategories",
-	"add-a-new-category": "Add a new category",
-	"new-category": "New category",
-	"slug": "slug",
-	"edit-category": "Edit category",
-
-	"new-theme-configured": "New theme configured",
-	"plugin-configured": "Plugin configured",
-	"new-category-created": "New category created",
-	"new-page-created": "New page created",
-	"page-deleted": "Page deleted",
-	"page-edited": "Page edited",
-	"user-edited": "User edited",
-	"changes-on-settings": "Changes on settings",
-	"plugin-installed": "Plugin installed",
-	"user-password-changed": "User password changed"
-
-}

install.php

@@ -166,10 +166,8 @@ if (empty($iniDate)) {
 // ============================================================================
 
 // Returns an array with all languages
-function getLanguageList()
+function getLanguageList() {
-{
 	$files = glob(PATH_LANGUAGES.'*.json');
-
 	$tmp = array();
 	foreach ($files as $file) {
 		$t = new dbJSON($file, false);
@@ -496,13 +494,11 @@ function install($adminPassword, $email, $timezone)
 	$data = 'Title: '.$Language->get('Welcome').'
 Content:
 
-## '.$Language->get('Whats next').'
 - '.$text1.'
 - '.$Language->get('Follow Bludit on').' [Twitter](https://twitter.com/bludit) / [Facebook](https://www.facebook.com/bluditcms) / [Google+](https://plus.google.com/+Bluditcms)
 - '.$Language->get('Chat with developers and users on Gitter').'
-- '.$Language->get('Visit the support forum').'
+- '.$Language->get('visit-the-forum-for-support').'
-- '.$Language->get('Read the documentation for more information').'
+- '.$Language->get('Read the documentation for more information');
-- '.$Language->get('Share with your friends and enjoy');
 
 	file_put_contents(PATH_PAGES.'welcome'.DS.FILENAME, $data, LOCK_EX);
 
@@ -647,8 +643,8 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' ) {
 		<select id="jslanguage" name="language" class="uk-width-1-1">
 		<?php
 			$htmlOptions = getLanguageList();
-			foreach($htmlOptions as $locale=>$nativeName) {
+			foreach($htmlOptions as $fname=>$native) {
-				echo '<option value="'.$locale.'"'.( ($localeFromHTTP===$locale)?' selected="selected"':'').'>'.$nativeName.'</option>';
+				echo '<option value="'.$fname.'"'.( ($finalLanguage===$fname)?' selected="selected"':'').'>'.$native.'</option>';
 			}
 		?>
 		</select>