Merge branch 'master' into BK-2085

Author: ride90

AUTHORS.txt

@@ -47,8 +47,11 @@ Jujhar Singh (Punjabi)
 Katerina Michailidi, George Battes (Greek)
 Kjetil Nordengen, Paul Graabein (Norwegian)
 Luba Sirina, Marina Klinova, Andrey Podshivalov, Oleg Pshenichniy, Ivan Satsiuk (Russian)
+Marius (Romanian)
+Meysam Shaygan, Dr. Somaye Joolaee (Farsi)
 Raoul Breugelmans, Hiroyuki Anraku (Japanese)
 Rivo Zängov (Estonian)
 Seongho Jang (Korean)
+Tahseen Zayouna, Dr. Somaye Joolaee (Arabic)
 Tomi Toivio (Finnish)
 Zsolt Magyar, Csaba Madarász (Hungarian)

docs/deployment/createbooktype.rst

@@ -2,16 +2,16 @@
 Createbooktype
 ==============
 
-Createbooktype is Booktype's command-line utility for creating :doc:`Booktype projects </deployment/structure>` on the disk with auto generated configuration files.
+Createbooktype is a command-line utility for creating :doc:`Booktype projects </deployment/structure>` with automatically generated configuration files.
 
 Usage
 =====
 
 .. code-block:: bash
 
-    createbooktype [--database <type>|--profile <type>|--check-versions] <project location>
+    createbooktype [--database <type>|--check-versions] <project location>
 
-<project location> can be full path to project location or name of the project. 
+<project location> can be the full path to the project location or the name of the project.
 
 Example:
 
@@ -25,7 +25,7 @@ argument                  project name
 
 .. note::
 
-   User must have write permissions to create or write to the project location. If project location already exists it will just create the needed files. 
+   The user must have write permissions to create or write to the project location. If the project location already exists it will just create the needed files.
 
 Options
 =======
@@ -54,12 +54,6 @@ Show messages.
 
 Configure *Project* to use specific database backend. Options are: "postgres", "postgresql", "sqlite".
 
-.. code-block:: bash
-
-    --profile <type>
-
-Configure *Project* to use profile <type>. Options are: "dev", "prod".
-
 .. code-block:: bash
 
     --check-versions
@@ -76,15 +70,15 @@ Specifies the default VIRTUAL_ENV
 Examples of usage
 =================
 
-This will create project called **bk2** in current directory. It will use PostgreSQL database as a backend and automatically be set i$
+This will create a project called **bk2** in the current directory. It will use the PostgreSQL database as a backend by default.
 
 .. code-block:: bash
 
     $ ./scripts/createbooktype bk2
 
 
-This will create project called **mybk** in /var/www/ directory. It will use Sqlite3 as a backend and will be set in development prof$
+This will create a project called **mybk** in the /var/www/ directory using Sqlite3 as a backend.
 
 .. code-block:: bash
 
-    $ ./scripts/createbooktype --database sqlite3  --profile dev /var/www/mybk/
+    $ ./scripts/createbooktype --database sqlite3 /var/www/mybk/

lib/booki/editor/fixtures/languages.json

@@ -189,5 +189,21 @@
             "abbrevation": "et",
             "name": "Eesti keel"
         }
+    },
+    {
+        "pk": 25,
+        "model": "editor.language",
+        "fields": {
+            "abbrevation": "fa",
+            "name": "فارسی"
+        }
+    },
+    {
+        "pk": 26,
+        "model": "editor.language",
+        "fields": {
+            "abbrevation": "ro",
+            "name": "Română"
+        }
     }
 ]