Merge branch 'master' of https://github.com/sourcefabric/Newscoop int…

…o next
sourcefabric · Sep 15, 2014 · 912d77f · 912d77f
2 parents 666e5a0 + b23fd52
commit 912d77f
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 32 deletions.
diff --git a/newscoop/classes/cache/TemplateCacheHandler_DB.php b/newscoop/classes/cache/TemplateCacheHandler_DB.php
@@ -164,7 +164,7 @@ static function handler($action, &$cache_content, $tpl_file = null, $cache_id =
  . "content = '" . addslashes($cache_content) . "' WHERE "
  . $cacheParams[$tpl_file]['where'];
  } else {
- $queryStr = 'INSERT INTO Cache (' . implode(',', array_keys($campsiteVector))
+ $queryStr = 'INSERT IGNORE INTO Cache (' . implode(',', array_keys($campsiteVector))
  . ',template,expired,content) VALUES (';
  foreach ($campsiteVector as $key => $value) {
  $queryStr .= !isset($value) ? ($key == 'params' ? "''" : '0') . ','
@@ -174,9 +174,7 @@ static function handler($action, &$cache_content, $tpl_file = null, $cache_id =
  }
  unset($cacheParams[$tpl_file]);
 
- try {
- $g_ado_db->executeUpdate($queryStr);
- } catch (\Doctrine\DBAL\DBALException $e) {}
+ $g_ado_db->executeUpdate($queryStr);
 
  $return = $g_ado_db->affected_rows() > 0;
  }

diff --git a/newscoop/install/Resources/sql/upgrade/4.3.x/2013.11.21/data-required.sql b/newscoop/install/Resources/sql/upgrade/4.3.x/2013.11.21/data-required.sql
@@ -1,5 +1,3 @@
-
--- Update languages, by code since that is already unique and more practical then ID
 UPDATE `Languages` SET `RFC3066bis` = "en-US" WHERE `Code` = "en";
 UPDATE `Languages` SET `RFC3066bis` = "de-DE" WHERE `Code` = "de";
 UPDATE `Languages` SET `RFC3066bis` = "pt-PT" WHERE `Code` = "pt";

diff --git a/newscoop/install/Resources/sql/upgrade/4.3.x/2013.11.21/tables.sql b/newscoop/install/Resources/sql/upgrade/4.3.x/2013.11.21/tables.sql
@@ -1,3 +1 @@
-
--- Add field for new language codes
 ALTER TABLE `Languages` ADD `RFC3066bis` varchar(255) COLLATE 'utf8_general_ci' NOT NULL DEFAULT '' AFTER `Code`;
diff --git a/newscoop/install/Resources/sql/upgrade/4.3.x/2014.01.13/tables.sql b/newscoop/install/Resources/sql/upgrade/4.3.x/2014.01.13/tables.sql
@@ -1,7 +1,3 @@
-# Introduce the Snippet Entity
----
---- Snippets
----
 DROP TABLE IF EXISTS `Snippets`;
 CREATE TABLE Snippets (
  Id INT AUTO_INCREMENT NOT NULL,
@@ -12,7 +8,6 @@ CREATE TABLE Snippets (
  UNIQUE INDEX UNIQ_1457978AF846113F (TemplateId),
  PRIMARY KEY(Id)
 ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
-
 DROP TABLE IF EXISTS `SnippetTemplates`;
 CREATE TABLE SnippetTemplates (
  Id INT AUTO_INCREMENT NOT NULL,
@@ -25,9 +20,7 @@ CREATE TABLE SnippetTemplates (
  IconActive LONGTEXT NOT NULL,
  PRIMARY KEY(Id)
 ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
-
 ALTER TABLE Snippets ADD CONSTRAINT SnippetTemplate FOREIGN KEY (TemplateId) REFERENCES SnippetTemplates (Id);
-
 DROP TABLE IF EXISTS `ArticleSnippets`;
 CREATE TABLE ArticleSnippets (
  ArticleId INT NOT NULL,

diff --git a/newscoop/install/Resources/sql/upgrade/4.3.x/2014.08.11/tables.sql b/newscoop/install/Resources/sql/upgrade/4.3.x/2014.08.11/tables.sql
@@ -1,7 +1,4 @@
-ALTER TABLE `ArticleImageCaptions` CHANGE `caption` `caption` text COLLATE 'utf8_general_ci' NOT NULL DEFAULT '';
-
+ALTER TABLE `ArticleImageCaptions` CHANGE `caption` `caption` text COLLATE 'utf8_general_ci' NOT NULL;
 ALTER TABLE `Images` DROP INDEX `Description`;
-
-ALTER TABLE `Images` CHANGE `Description` `Description` text COLLATE 'utf8_general_ci' NOT NULL DEFAULT '';
-
+ALTER TABLE `Images` CHANGE `Description` `Description` text COLLATE 'utf8_general_ci' NOT NULL;
 ALTER TABLE `Images` ADD INDEX `Description` (`Description`(100));
diff --git a/newscoop/install/SymfonyRequirements.php b/newscoop/install/SymfonyRequirements.php
@@ -459,6 +459,12 @@ public function __construct()
  "Change the permissions of the \"<strong>$baseDir/images/</strong>\" directory so that the web server can write into it."
  );
 
+ $this->addRecommendation(
+ function_exists('mail'),
+ "sendmail should be installed",
+ "Install 'sendmail' package so that the Newscoop can send mails."
+ );
+
  $this->addPhpIniRequirement(
  'date.timezone', true, false,
  'date.timezone setting must be set',

diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fr.yml
@@ -1,4 +1,4 @@
-'No such article type': 'pas de type d''article'
+'No such article type': 'Pas de type d''article'
 'Multi-line Text': null
 'Filter saved': null
 'Filter not saved': null
@@ -12,7 +12,7 @@
 vertices: null
 'There was a problem trying to execute the XML RPC function.': null
 'The Campcaster server configuration is invalid.': null
-'Pan Map': null
+'Pan Map': 'Carte panoramique'
 'Open large map': null
 'No news available.': null
 'Edit Polygon': null
@@ -28,7 +28,7 @@ Homepage: null
 Map: null
 Center: null
 Title: Titre
-'Invalid security token.': null
+'Invalid security token.': 'Jeton de sécurité invalide.'
 'Callback $1 is not callable.': null
 'Article translated to $4 ($5)': null
 'Article status changed from $1 to $2.': null
@@ -58,9 +58,9 @@ Numeric: null
 Last: Dernier
 First: Premier
 'Single-line Text': Texte
-'Multi-line Text with WYSIWYG': 'Corps de l article'
-'URL $1 is invalid or is not an image.': 'URL $1 nest pas valide ou nest pas une image'
-'URL $1 is not an image.': 'URL $1 nest pas une image'
+'Multi-line Text with WYSIWYG': null
+'URL $1 is invalid or is not an image.': null
+'URL $1 is not an image.': 'L''URL $1 n''est pas une image'
 client:
  added: null
  notfound: null

diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_files.fr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_files.fr.yml
@@ -17,7 +17,7 @@
 'File Name': null
 Download: null
 'File $1 updated.': null
-'Edit article': 'Editer article'
+'Edit article': 'Éditer l''article'
 'You do not have the right to delete file attachments.': 'Vous navez pas le droit de supprimer des attachements de fichier. '
 'You must select a file to upload.': 'Vous devez choisir un fichier à télécharger.'
 'You do not have the right to delete files.': 'Vous navez pas le droit de supprimer des fichiers'
@@ -28,11 +28,11 @@ Download: null
 'Please enter a description for the file.': 'Entrez Sil vous plaît une description pour le fichier.'
 'Open in the browser': 'Ouvrir dans le navigateur '
 'Only this translation': 'Seulement cette traduction'
-'File information': 'Information de fichier '
+'File information': 'Information du fichier '
 'Do you want this file to open in the users browser, or to automatically download?': 'Voulez-vous que ce fichier souvre dans le navigateur de lutilisateur, ou automatiquement téléchargé ? '
-'Change file information': 'Changer linformation du fichier'
+'Change file information': 'Changer l''information du fichier'
 'Automatically download': 'Automatiquement téléchargé'
 Attachments: 'Attachements '
-'Attachment does not exist.': 'Lattachement nexiste pas. '
+'Attachment does not exist.': 'L''attachement n''existe pas. '
 'Attach File to Article': 'Attacher Fichier à Article '
 'All translations': 'Toutes les traductions '
diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fr.yml
@@ -57,7 +57,7 @@ Caption: null
 'The image number specified is already in use.': null
 'Image $1 updated.': null
 'Image $1 added.': null
-'Edit article': 'Editer article'
+'Edit article': 'Éditer l''article'
 'You do not have the right to attach images to articles.': 'Vous navez pas le droit dattacher des images aux articles. '
 'You do not have the right to add images.': 'Vous navez pas le droit dajouter des images. '
 'Image information': 'Information dimage '

diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/media_archive.fr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/media_archive.fr.yml
@@ -18,7 +18,7 @@ Feedback: null
 'Only this translation': 'Seulement cette traduction'
 'No files for multi editing.': null
 'Edit files': null
-'Change file information': 'Changer linformation du fichier'
+'Change file information': 'Changer l''information du fichier'
 'All translations': 'Toutes les traductions '
 'Save All': null
 Files: null