Skip to content

Commit

Permalink
Merge pull request #176 from ravage84/shell-messages-quotes
Browse files Browse the repository at this point in the history
Made the migration shell messages more clear
  • Loading branch information
Florian Krämer committed Aug 17, 2014
2 parents de8e388 + cca5544 commit c98f004
Show file tree
Hide file tree
Showing 9 changed files with 1,123 additions and 666 deletions.
18 changes: 18 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# User specific & automatically generated files #
#################################################
*.mo

# IDE and editor specific files #
#################################
.idea

# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db
18 changes: 9 additions & 9 deletions Console/Command/MigrationShell.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@ public function startup() {
$this->Version = new MigrationVersion($options);

$this->_messages = array(
'create_table' => __d('migrations', 'Creating table :table.'),
'drop_table' => __d('migrations', 'Dropping table :table.'),
'rename_table' => __d('migrations', 'Renaming table :old_name to :new_name.'),
'add_field' => __d('migrations', 'Adding field :field to :table.'),
'drop_field' => __d('migrations', 'Dropping field :field from :table.'),
'change_field' => __d('migrations', 'Changing field :field from :table.'),
'rename_field' => __d('migrations', 'Renaming field :old_name to :new_name on :table.'),
'add_index' => __d('migrations', 'Adding index :index to :table.'),
'drop_index' => __d('migrations', 'Dropping index :index from :table.'),
'create_table' => __d('migrations', 'Creating table ":table".'),
'drop_table' => __d('migrations', 'Dropping table ":table".'),
'rename_table' => __d('migrations', 'Renaming table ":old_name" to ":new_name".'),
'add_field' => __d('migrations', 'Adding field ":field" to table ":table".'),
'drop_field' => __d('migrations', 'Dropping field ":field" from table ":table".'),
'change_field' => __d('migrations', 'Changing field ":field" from table ":table".'),
'rename_field' => __d('migrations', 'Renaming field ":old_name" to ":new_name" on table ":table".'),
'add_index' => __d('migrations', 'Adding index ":index" to table ":table".'),
'drop_index' => __d('migrations', 'Dropping index ":index" from table ":table".'),
);
}

Expand Down
2 changes: 1 addition & 1 deletion Lib/CakeMigration.php
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ protected function _run() {
try {
$result = $this->{$methodName}($type, $info);
} catch (Exception $e) {
throw new MigrationException($this, sprintf(__d('migrations', '%s'), $e->getMessage()));
throw new MigrationException($this, $e->getMessage());
}
}
return $result;
Expand Down
Loading

0 comments on commit c98f004

Please sign in to comment.