Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix english in GUI labels #31

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix english in GUI labels #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions library/Fileshipper/ProvidedHook/Director/ImportSource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion library/Fileshipper/Xlsx/Workbook.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion library/Fileshipper/Xlsx/Worksheet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down