From ea4ab0e9883d4058f2d769e7162f61c04c255c7a Mon Sep 17 00:00:00 2001 From: Etienne CHAMPETIER Date: Fri, 6 Sep 2013 09:11:47 +0200 Subject: [PATCH 1/3] Correct editor.openlayer i18n files Signed-off-by: Etienne CHAMPETIER --- core/src/plugins/editor.openlayer/i18n/de.php | 2 +- core/src/plugins/editor.openlayer/i18n/en.php | 2 +- core/src/plugins/editor.openlayer/i18n/es.php | 2 +- core/src/plugins/editor.openlayer/i18n/fr.php | 2 +- core/src/plugins/editor.openlayer/i18n/pt.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/plugins/editor.openlayer/i18n/de.php b/core/src/plugins/editor.openlayer/i18n/de.php index 34c6a48541..bd38fb435b 100644 --- a/core/src/plugins/editor.openlayer/i18n/de.php +++ b/core/src/plugins/editor.openlayer/i18n/de.php @@ -11,4 +11,4 @@ "8" => "Filter", "9" => "Suchen", "10" => "Löschen", -) +); diff --git a/core/src/plugins/editor.openlayer/i18n/en.php b/core/src/plugins/editor.openlayer/i18n/en.php index 198cca165f..4847b02609 100644 --- a/core/src/plugins/editor.openlayer/i18n/en.php +++ b/core/src/plugins/editor.openlayer/i18n/en.php @@ -11,4 +11,4 @@ "8" => "Filter", "9" => "Search", "10" => "Clear", -) +); diff --git a/core/src/plugins/editor.openlayer/i18n/es.php b/core/src/plugins/editor.openlayer/i18n/es.php index 8fdf05dc66..255f790b3d 100644 --- a/core/src/plugins/editor.openlayer/i18n/es.php +++ b/core/src/plugins/editor.openlayer/i18n/es.php @@ -11,4 +11,4 @@ "8" => "Filtrar", "9" => "Buscar", "10" => "Limpiar", -) +); diff --git a/core/src/plugins/editor.openlayer/i18n/fr.php b/core/src/plugins/editor.openlayer/i18n/fr.php index f5469ac788..f2bd035b89 100644 --- a/core/src/plugins/editor.openlayer/i18n/fr.php +++ b/core/src/plugins/editor.openlayer/i18n/fr.php @@ -11,4 +11,4 @@ "8" => "Filtre", "9" => "Chercher", "10" => "Effacer", -) +); diff --git a/core/src/plugins/editor.openlayer/i18n/pt.php b/core/src/plugins/editor.openlayer/i18n/pt.php index ce55ac0d89..9775021684 100644 --- a/core/src/plugins/editor.openlayer/i18n/pt.php +++ b/core/src/plugins/editor.openlayer/i18n/pt.php @@ -11,4 +11,4 @@ "8" => "Filtro", "9" => "Procurar", "10" => "Limpar", -) +); From 0fe67c9db286013f617e2a0b4a2b2553ae10ce3d Mon Sep 17 00:00:00 2001 From: Etienne CHAMPETIER Date: Fri, 6 Sep 2013 09:13:29 +0200 Subject: [PATCH 2/3] Correct access.wms i18n files Signed-off-by: Etienne CHAMPETIER --- core/src/plugins/access.wms/i18n/de.php | 2 +- core/src/plugins/access.wms/i18n/en.php | 2 +- core/src/plugins/access.wms/i18n/es.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/plugins/access.wms/i18n/de.php b/core/src/plugins/access.wms/i18n/de.php index 6e6a063729..ecad7549a7 100644 --- a/core/src/plugins/access.wms/i18n/de.php +++ b/core/src/plugins/access.wms/i18n/de.php @@ -7,4 +7,4 @@ "4" => "Style", "5" => "Stichwörter", "6" => "Vorschau", -) +); diff --git a/core/src/plugins/access.wms/i18n/en.php b/core/src/plugins/access.wms/i18n/en.php index d4a730fdf5..f88ffaa025 100644 --- a/core/src/plugins/access.wms/i18n/en.php +++ b/core/src/plugins/access.wms/i18n/en.php @@ -7,4 +7,4 @@ "4" => "Style", "5" => "Keywords", "6" => "Projection", -) +); diff --git a/core/src/plugins/access.wms/i18n/es.php b/core/src/plugins/access.wms/i18n/es.php index 00d24c9808..0b59e400a1 100644 --- a/core/src/plugins/access.wms/i18n/es.php +++ b/core/src/plugins/access.wms/i18n/es.php @@ -7,4 +7,4 @@ "4" => "Estilo", "5" => "Palábras Clave", "6" => "Proyección", -) +); From a9c69aed862dbacd4cdeda6155044fff4e662caa Mon Sep 17 00:00:00 2001 From: Etienne CHAMPETIER Date: Fri, 6 Sep 2013 09:39:53 +0200 Subject: [PATCH 3/3] Correct php-cs-fixer visibility messup in svn_lib.inc.php Signed-off-by: Etienne CHAMPETIER --- core/src/plugins/meta.svn/svn_lib.inc.php | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/core/src/plugins/meta.svn/svn_lib.inc.php b/core/src/plugins/meta.svn/svn_lib.inc.php index 64e7b0af54..76cb35bb11 100644 --- a/core/src/plugins/meta.svn/svn_lib.inc.php +++ b/core/src/plugins/meta.svn/svn_lib.inc.php @@ -99,7 +99,7 @@ * * @since v1.0.0 */ - public function GetSvnHelp() + function GetSvnHelp() { $command = 'svn'; $switches = '--help'; @@ -116,7 +116,7 @@ public function GetSvnHelp() * * @since v1.0.0 */ - public function GetSvnLookHelp() + function GetSvnLookHelp() { $command = 'svnlook'; $switches = '--help'; @@ -133,7 +133,7 @@ public function GetSvnLookHelp() * * @since v1.0.0 */ - public function GetSvnAdminHelp() + function GetSvnAdminHelp() { $command = 'svnadmin'; $switches = '--help'; @@ -150,7 +150,7 @@ public function GetSvnAdminHelp() * * @since v1.0.0 */ - public function GetSvnVersionHelp() + function GetSvnVersionHelp() { $command = 'svnversion'; $switches = '--help'; @@ -164,7 +164,7 @@ public function GetSvnVersionHelp() * * @since v1.0.0 */ - public function GetSvnVersion() + function GetSvnVersion() { $command = 'svn'; $switches = '--version'; @@ -208,7 +208,7 @@ function &GetRepositoryInfo($config){ * * @since v1.0.0 * */ - public function GetHeadRevision($config) + function GetHeadRevision($config) { $info = GetRepositoryInfo($config); $rev = ParseArray($info[IDX_STDOUT], 'revision="', '">'); @@ -223,7 +223,7 @@ public function GetHeadRevision($config) * * @since v1.0.0 */ - public function GetHeadDate($config) + function GetHeadDate($config) { $info = GetRepositoryInfo($config); $timestamp = ParseArray($info[IDX_STDOUT], '', ''); @@ -269,7 +269,7 @@ function &GetWebspaceInfo($config, $xml_output = true){ * * @since v1.0.0 */ - public function GetWebspaceRevision($config) + function GetWebspaceRevision($config) { $info = GetWebspaceInfo($config); return ParseArray($info[IDX_STDOUT], 'revision="', '">'); @@ -284,7 +284,7 @@ public function GetWebspaceRevision($config) * * @since v1.0.0 */ - public function GetWebspaceSourcePath($config) + function GetWebspaceSourcePath($config) { $info = GetWebspaceInfo($config); $ws_path = ParseArray($info[IDX_STDOUT], '', ''); @@ -301,7 +301,7 @@ public function GetWebspaceSourcePath($config) * * @since v1.0.0 */ - public function GetWebspaceRevisionDate($config) + function GetWebspaceRevisionDate($config) { $info = GetWebspaceInfo($config); $timestamp = ParseArray($info[IDX_STDOUT], '', ''); @@ -366,7 +366,7 @@ function &GetWebspaceLog($config, $path){ * * @since v1.1.0 */ - public function ListRepository($config, $path) + function ListRepository($config, $path) { //$rep_root = $config->GetRepositoryRoot(); $rep_root = $config->getOption("REPOSITORY_ROOT").$path; @@ -419,7 +419,7 @@ function &GetBranches($config){ * * @since v1.0.0 */ - public function GetRepositoryPaths($config, $roots, $depth) + function GetRepositoryPaths($config, $roots, $depth) { $rep_root = $config->GetRepositoryRoot(); if (!is_array($roots)) { @@ -486,7 +486,7 @@ function &BuildSvnDirTree(&$paths, &$tree, $max_level, $parent_dir = ''){ * * @since v1.0.0 */ - public function UpdateWebspace($config) + function UpdateWebspace($config) { $command = 'svn update'; $switches = '--non-interactive'; @@ -512,7 +512,7 @@ public function UpdateWebspace($config) * * @since v1.0.0 */ - public function CheckoutWebspace($config) + function CheckoutWebspace($config) { $trunk_path = $config->GetTrunkDir(); $command = 'svn checkout'; @@ -555,7 +555,7 @@ function &CleanupWebspace($config){ * * @since v1.0.0 */ - public function SwitchWebspace($config, $path) + function SwitchWebspace($config, $path) { if ($path == NULL) { $path = $config->GetTrunkDir(); @@ -578,7 +578,7 @@ public function SwitchWebspace($config, $path) * * @since v1.0.0 */ - public function GetSvnUsr($config) + function GetSvnUsr($config) { $user = $config->GetSvnUser(); $switch = ''; @@ -596,7 +596,7 @@ public function GetSvnUsr($config) * * @since v1.0.0 */ - public function GetSvnPw($config) + function GetSvnPw($config) { $pw = $config->GetSvnPassword(); $switch = ''; @@ -754,7 +754,7 @@ function &GetLineString($handle, $length = 4096){ * * @since v1.0.0 */ - public function ParseArray (&$array, $startstr, $endstr = NULL) + function ParseArray (&$array, $startstr, $endstr = NULL) { $idx = 0; while ($idx < count($array) && strpos($array[$idx], $startstr) === false) { @@ -783,7 +783,7 @@ public function ParseArray (&$array, $startstr, $endstr = NULL) * @version v.1.1.0 * @since v1.0.0 */ - public function PrintArray($array, $name = '', $encode_html_chars = true) + function PrintArray($array, $name = '', $encode_html_chars = true) { if (is_array($array)) { if (strlen($name) > 0) {