diff --git a/library/Fileshipper/ProvidedHook/Director/ImportSource.php b/library/Fileshipper/ProvidedHook/Director/ImportSource.php index 18a2377..6229e72 100644 --- a/library/Fileshipper/ProvidedHook/Director/ImportSource.php +++ b/library/Fileshipper/ProvidedHook/Director/ImportSource.php @@ -63,9 +63,9 @@ public static function addSettingsFormFields(QuickForm $form) 'label' => $form->translate('File format'), 'description' => $form->translate( 'Available file formats, usually CSV, JSON, YAML and XML. Whether' - . ' all of those are available eventually depends on various' - . ' libraries installed on your system. Please have a look at' - . ' the documentation in case your list is not complete.' + . ' these are currently available depends on various' + . ' libraries installed on your system. Please see' + . ' the documentation if you do not see the complete list.' ), 'required' => true, 'class' => 'autosubmit', @@ -137,8 +137,8 @@ protected static function addCsvElements(QuickForm $form) $form->addElement('text', 'csv_delimiter', array( 'label' => $form->translate('Field delimiter'), 'description' => $form->translate( - 'This sets the field delimiter. One character only, defaults' - . ' to comma: ,' + 'This sets the field delimiter. It must be exactly one' + . ' character, defaults to comma: ,' ), 'value' => ',', 'required' => true, @@ -147,8 +147,8 @@ protected static function addCsvElements(QuickForm $form) $form->addElement('text', 'csv_enclosure', array( 'label' => $form->translate('Value enclosure'), 'description' => $form->translate( - 'This sets the field enclosure character. One character only,' - . ' defaults to double quote: "' + 'This sets the field enclosure character. It must be exactly' + . ' one character,defaults to double quote: "' ), 'value' => '"', 'required' => true, diff --git a/library/Fileshipper/Xlsx/Workbook.php b/library/Fileshipper/Xlsx/Workbook.php index 9c20d95..7caeac6 100755 --- a/library/Fileshipper/Xlsx/Workbook.php +++ b/library/Fileshipper/Xlsx/Workbook.php @@ -238,7 +238,7 @@ public function getSheet($sheet) if (is_numeric($sheet)) { $sheet = $this->getSheetNameById($sheet); } elseif (!is_string($sheet)) { - throw new RuntimeException("Sheet must be a string or a sheet Id"); + throw new RuntimeException("Sheet must be a string or a sheet ID"); } if (!array_key_exists($sheet, $this->sheets)) { $this->sheets[$sheet] = new Worksheet($this->getSheetXML($sheet), $sheet, $this); diff --git a/library/Fileshipper/Xlsx/Worksheet.php b/library/Fileshipper/Xlsx/Worksheet.php index 18cc985..b139942 100755 --- a/library/Fileshipper/Xlsx/Worksheet.php +++ b/library/Fileshipper/Xlsx/Worksheet.php @@ -130,7 +130,7 @@ protected function parseData($sheetData) $rows[$curR][$col] = $rows[$cell[0]][$cell[1]]; } else { throw new RuntimeException(sprintf( - '%s should merge into %s, but %s has a value: %s', + '%s should merge into %s, but %s already has a value: %s', $this->makeCellName($cell[0], $cell[1]), $this->makeCellName($curR, $col), $this->makeCellName($curR, $col),