Merge branch 'release/3.2.2'

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.2.2 - 2024-03-25
+
+### Updated
+- docs
+
 ## 3.2.1 - 2024-03-20
 
 ### Fixed
@@ -44,6 +49,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ### Added
 - Craft 5 support
 
+## 2.6.3 - 2024-03-25
+
+### Updated
+- docs
+
 ## 2.6.2 - 2024-03-20
 
 ### Fixed

README.md

@@ -49,6 +49,10 @@ Trim spaces at begin or ending of values when they are saved.
 When a new unknown translation is used while rendering templates, an event is triggered.
 Handling this event is optional. A new empty translation row will be added for the missing message.
 
+### Copy Entry bulk action
+
+Enable [this feature](#copy-entries-in-bulk-action)
+
 ## Importing translations
 
 ![Screenshot](resources/img/screenshot_import.png)
@@ -84,7 +88,13 @@ message rows in the database:
 ## Exporting
 
 1. Export all the rows using the export tab
-2. Or select the rows in the table to export
+2. Or, in the overview table, select the rows and languages to export
+ - as csv file
+ - as a content migration file
+
+### Migration file export
+
+The advantage of exporting to a migration file is that your content can be pushed to git and then the server when deploying. The migration file adds the rows to your database when `craft up` or `craft migrate/all` is executed.
 
 ## Manage translations
 
@@ -95,8 +105,6 @@ message rows in the database:
 To enable this functionality both enable this in the settings 
 and set the permission for the user ("Copy content bulk action").
 
-You can also enable this in `config/database-translations.php`
-
 You can now select Entries in the index table, and select the bulk action.
 The content will be copied over to the other site in a queue job.
 

package.json

@@ -1,6 +1,6 @@
 {
  "name": "craft-database-translations",
- "version": "3.2.1",
+ "version": "3.2.2",
  "description": "A translations plugin for Craft CMS",
  "scripts": {
  "dev": "cross-env NODE_ENV=development webpack --progress --config=webpack.config.js",

src/config.php

@@ -17,7 +17,7 @@
 return [
 // 'pluginName' => 'Translations',
 // 'categories' => [['key' => 'site']],
-// 'mapLocales' => [],
+// 'mapLocales' => [['source'=>'nl', 'destination'=>'nl-BE']], 
 // 'handleMissingTranslationEvent' => false,
 // 'handleMissingTranslationEventOnlyInDevMode' => true,
 // 'trimValuesOnSave' => true,

src/templates/index.twig

@@ -30,7 +30,13 @@
  {% else %}
  <h2>Hi!</h2>
  <p>Your database is empty</p>
- <p>Start with <a href="{{ url('database-translations/create') }}">an import</a> or enable event to listen to missing translations in <a href="{{ url('database-translations/settings') }}">the settings</a>.</p>
+ <p>
+ Start with <a href="{{ url('database-translations/create') }}">an import</a>
+ {% if currentUser.admin and craft.app.config.general.allowAdminChanges %}
+ or enable event to listen to missing translations in 
+ <a href="{{ url('database-translations/settings') }}">the settings</a>.
+ {% endif %}
+ </p>
  {% endif %}
  </div>
 {% endblock %}