Merge pull request #3952 from ushahidi/develop

Merge pull request ##3947-Replaced-URL-of-New-Twitter-App to master.
ushahidi · Apr 22, 2020 · ee5d9f7 · ee5d9f7
2 parents 23595af + 169b553
commit ee5d9f7
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 6 deletions.
diff --git a/docs/api/dataproviders.apib b/docs/api/dataproviders.apib
@@ -342,7 +342,7 @@
                     "intro_step1": {
                         "label": "Step 1: Create a new Twitter application",
                         "input": "read-only-text",
-                        "description": "Create a <a href=\"https://apps.twitter.com/app/new\">new twitter application</a>"
+                        "description": "Create a <a href=\"https://developer.twitter.com/en/apps/create\">new twitter application</a>"
                     },
                     "intro_step2": {
                         "label": "Step 2: Generate a consumer key and secret",

diff --git a/resources/lang/cs/hxl_metadata.php b/resources/lang/cs/hxl_metadata.php
@@ -0,0 +1,7 @@
+<?php
+
+return array(
+    'uniqueMetadataByJob' => 'Nelze vytvořit entitu metadat pro úlohu, která ji již má',
+    'privateShouldNotBeEmpty' => 'Private should be a boolean. Received: NULL'
+
+);
diff --git a/resources/lang/cs/media.php b/resources/lang/cs/media.php
@@ -0,0 +1,7 @@
+<?php
+
+return array(
+    'size_error' => 'Velikost souboru by měla být menší než: param1 MB',
+    'mime_type_not_allowed' => 'Typ souboru není podporován. Nahrajte prosím soubor obrázku.',
+    'mime_not_empty' => 'Typ MIME nebyl nalezen. Pro soubor musí být nastaven typ MIME.'
+);
diff --git a/resources/lang/cs/notifications.php b/resources/lang/cs/notifications.php
@@ -3,10 +3,10 @@
 return array(
     'email' => array(
         'title' => '[:sitename] Nový příspěvek: :title',
-        'message' => "New post on :sitename\n\n:title\n\n:content\n\nView post: :url"
+        'message' => "Nový příspěvek na :sitename\n\n:title\n\n:content\n\nView post: :url"
     ),
     'sms' => array(
         'title' => '',
-        'message' => 'New post on :sitename\n\n:title\n\n:content\n\nView post: :url',
+        'message' => 'Nový příspěvek na :sitename\n\n:title\n\n:content\n\nView post: :url',
     )
 );
diff --git a/resources/lang/en_GB/contacts.php b/resources/lang/en_GB/contacts.php
@@ -0,0 +1,6 @@
+<?php
+// @codingStandardsIgnoreFile
+
+return array(
+    'failedToCreateContact' => 'Could not create contacts. Result:  %s',
+);
diff --git a/resources/lang/es/data-sources.php b/resources/lang/es/data-sources.php
@@ -58,8 +58,8 @@
     'Auth Token' => 'Token de Autenticación',
     'SMS Auto response' => 'Respuesta automática de SMS',
     'Step 1: Create a new Twitter application' => 'Paso 1: Cree una nueva aplicación de Twitter',
-    'Create a <a href="https://apps.twitter.com/app/new">new twitter application</a>'
-        => 'Cree una <a href="https://apps.twitter.com/app/new">nueva aplicación de twitter</a>',
+    'Create a <a href="https://developer.twitter.com/en/apps/create">new twitter application</a>'
+        => 'Cree una <a href="https://developer.twitter.com/en/apps/create">nueva aplicación de twitter</a>',
     'Step 2: Generate a consumer key and secret' => 'Paso 2: Genere una clave de consumidor y código secreto',
     'Once you\'ve created the application click on "Keys and Access Tokens".<br /> Then click "Generate Consumer Key and Secret".<br /> Copy keys, tokens and secrets into the fields below.'
         => 'Una vez que haya creado la aplicación, haga clic en "Tokens Clave y de Acceso".<br /> Luego haga clic en "Generar clave de consumidor y código secreto".<br /> Copie las claves, los tokens y los códigos secretos en los campos de abajo.',

diff --git a/src/App/DataSource/Twitter/Twitter.php b/src/App/DataSource/Twitter/Twitter.php
@@ -76,7 +76,7 @@ public function getOptions()
                 'description' => function () {
                     return 'Twitter applications may take some time to be approved by Twitter.
                      Please be aware of this if you need this data quickly.
-                    <br><br>Create your <a href="https://apps.twitter.com/app/new" target="_blank">
+                    <br><br>Create your <a href="https://developer.twitter.com/en/apps/create" target="_blank">
                     Twitter application here</a>.';
                 }
             ],