Merge branch '1.2-fixes' into 'master'

merge 1.2 fixes into master

See merge request fusiondirectory/fd-plugins!231

.gitlab-ci.yml

+# Specify docker image
+image: debian:stretch
+
+# Define variable to disable SSL verification of GIT
+variables:
+  GIT_SSL_NO_VERIFY: "true"
+
+stages:
+  - lint
+  - codestyle
+  - manpages
+  - transifex
+  - tarballs
+
+## Stage lint
+
+# PHP lint (jessie)
+create_php_lint_rapport_jessie:
+  image: php:5.6.33-cli-jessie
+  stage: lint
+  only:
+    - branches
+  script:
+    - find . -type f -name '*.php' -o -name '*.inc' -print0 | xargs -0 -n1 php -l
+
+# PHP lint (stretch)
+create_php_lint_rapport_stretch:
+  image: php:cli-stretch
+  stage: lint
+  only:
+    - branches
+  script:
+    - find . -type f -name '*.php' -o -name '*.inc' -print0 | xargs -0 -n1 php -l
+
+## Stage transifex
+
+# fusiondirectory-update-locale
+fusiondirectory-update-locale:
+  image: php:cli-stretch
+  stage: transifex
+  only:
+    - branches
+  before_script:
+    - apt-get update -qq
+    - apt-get install -y -qq gettext git
+  script:
+    - git clone https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
+    - ../dev-tools/locale-scripts/fusiondirectory-update-locale-plugins
+
+# Update transifex
+update-transifex:
+  image: php:cli-stretch
+  stage: transifex
+  only:
+    - /^1.*$/
+  before_script:
+    - apt-get update -qq
+    - apt-get install -y -qq gettext git transifex-client
+  script:
+    - git clone https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
+    - echo $'[https://www.transifex.com]\nhostname = https://www.transifex.com\nusername = '"$TRANSIFEX_USER"$'\npassword = '"$TRANSIFEX_PASSWORD"$'\ntoken = '"$TRANSIFEX_API_TOKEN"$'\n' > ~/.transifexrc
+    - tx pull -a -f
+    - ../dev-tools/locale-scripts/fusiondirectory-update-locale-plugins
+    - tx push -f -s -t --skip --no-interactive
+
+build-tarballs:
+  stage: tarballs
+  script:
+    - tar -cvzf fusiondirectory-plugins.tar.gz *
+  artifacts:
+    paths:
+    - fusiondirectory-plugins.tar.gz
+    expire_in: 1h
+
+build-release:
+  stage: tarballs
+  only:
+    - tags
+  script: 
+    - tar -cvzf fusiondirectory-plugins-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"').tar.gz *
+  artifacts:
+    paths:
+      - fusiondirectory-plugins-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"').tar.gz

.tx/config

@@ -2,253 +2,252 @@
 host = https://www.transifex.com
 type = PO
 
-[FusionDirectory-1x.alias]
+[fusiondirectory-12.alias]
 file_filter = alias/locale/<lang>/fusiondirectory.po
 source_file = alias/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.applications]
+[fusiondirectory-12.applications]
 file_filter = applications/locale/<lang>/fusiondirectory.po
 source_file = applications/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.argonaut]
+[fusiondirectory-12.argonaut]
 file_filter = argonaut/locale/<lang>/fusiondirectory.po
 source_file = argonaut/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.audit]
+[fusiondirectory-12.audit]
 file_filter = audit/locale/<lang>/fusiondirectory.po
 source_file = audit/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.autofs]
+[fusiondirectory-12.autofs]
 file_filter = autofs/locale/<lang>/fusiondirectory.po
 source_file = autofs/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.certificates]
+[fusiondirectory-12.certificates]
 file_filter = certificates/locale/<lang>/fusiondirectory.po
 source_file = certificates/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.community]
+[fusiondirectory-12.community]
 file_filter = community/locale/<lang>/fusiondirectory.po
 source_file = community/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.cyrus]
+[fusiondirectory-12.cyrus]
 file_filter = cyrus/locale/<lang>/fusiondirectory.po
 source_file = cyrus/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.debconf]
+[fusiondirectory-12.debconf]
 file_filter = debconf/locale/<lang>/fusiondirectory.po
 source_file = debconf/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.developers]
+[fusiondirectory-12.developers]
 file_filter = developers/locale/<lang>/fusiondirectory.po
 source_file = developers/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.dhcp]
+[fusiondirectory-12.dhcp]
 file_filter = dhcp/locale/<lang>/fusiondirectory.po
 source_file = dhcp/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.dns]
+[fusiondirectory-12.dns]
 file_filter = dns/locale/<lang>/fusiondirectory.po
 source_file = dns/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.dovecot]
+[fusiondirectory-12.dovecot]
 file_filter = dovecot/locale/<lang>/fusiondirectory.po
 source_file = dovecot/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.dsa]
+[fusiondirectory-12.dsa]
 file_filter = dsa/locale/<lang>/fusiondirectory.po
 source_file = dsa/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.ejbca]
+[fusiondirectory-12.ejbca]
 file_filter = ejbca/locale/<lang>/fusiondirectory.po
 source_file = ejbca/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.fai]
+[fusiondirectory-12.fai]
 file_filter = fai/locale/<lang>/fusiondirectory.po
 source_file = fai/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.freeradius]
+[fusiondirectory-12.freeradius]
 file_filter = freeradius/locale/<lang>/fusiondirectory.po
 source_file = freeradius/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.fusioninventory]
+[fusiondirectory-12.fusioninventory]
 file_filter = fusioninventory/locale/<lang>/fusiondirectory.po
 source_file = fusioninventory/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.gpg]
+[fusiondirectory-12.gpg]
 file_filter = gpg/locale/<lang>/fusiondirectory.po
 source_file = gpg/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.ipmi]
+[fusiondirectory-12.ipmi]
 file_filter = ipmi/locale/<lang>/fusiondirectory.po
 source_file = ipmi/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.ldapdump]
+[fusiondirectory-12.ldapdump]
 file_filter = ldapdump/locale/<lang>/fusiondirectory.po
 source_file = ldapdump/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.ldapmanager]
+[fusiondirectory-12.ldapmanager]
 file_filter = ldapmanager/locale/<lang>/fusiondirectory.po
 source_file = ldapmanager/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.mail]
+[fusiondirectory-12.mail]
 file_filter = mail/locale/<lang>/fusiondirectory.po
 source_file = mail/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.mixedgroups]
+[fusiondirectory-12.mixedgroups]
 file_filter = mixedgroups/locale/<lang>/fusiondirectory.po
 source_file = mixedgroups/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.nagios]
+[fusiondirectory-12.nagios]
 file_filter = nagios/locale/<lang>/fusiondirectory.po
 source_file = nagios/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.netgroups]
+[fusiondirectory-12.netgroups]
 file_filter = netgroups/locale/<lang>/fusiondirectory.po
 source_file = netgroups/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.newsletter]
+[fusiondirectory-12.newsletter]
 file_filter = newsletter/locale/<lang>/fusiondirectory.po
 source_file = newsletter/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.opsi]
+[fusiondirectory-12.opsi]
 file_filter = opsi/locale/<lang>/fusiondirectory.po
 source_file = opsi/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.personal]
+[fusiondirectory-12.personal]
 file_filter = personal/locale/<lang>/fusiondirectory.po
 source_file = personal/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.postfix]
-file_filter = postfix/locale/<lang>/fusiondirectory.po
-source_file = postfix/locale/en/fusiondirectory.po
-source_lang = en
-
-[FusionDirectory-1x.posix]
+[fusiondirectory-12.posix]
 file_filter = posix/locale/<lang>/fusiondirectory.po
 source_file = posix/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-1x.ppolicy]
+[fusiondirectory-12.postfix]
+file_filter = postfix/locale/<lang>/fusiondirectory.po
+source_file = postfix/locale/en/fusiondirectory.po
+source_lang = en
+
+[fusiondirectory-12.ppolicy]
 file_filter = ppolicy/locale/<lang>/fusiondirectory.po
 source_file = ppolicy/locale/en/fusiondirectory.po
 source_lang = en