------------------------------------------------------------
revno: 1145
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Thu 2012-03-15 20:52:07 +0100
message:
fixed bug 955162 Warnings from Upgrader
modified:
assets/apps/installer/TranslateUsingPo.php
assets/apps/upgrader/TranslateUsingPo.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'assets/apps/installer/TranslateUsingPo.php'
--- assets/apps/installer/TranslateUsingPo.php 2012-01-19 23:04:29 +0000
+++ assets/apps/installer/TranslateUsingPo.php 2012-03-15 19:52:07 +0000
@@ -122,18 +122,22 @@
// search all availabled languages
$founded = array();
$start = strlen($poFileDir)+1;
- foreach ( glob($poFileDir ."/*.po") as $poFile ) {
- // extract path and extension of file name.
- $founded []= substr($poFile,$start,-3);
- }
+ $poFiles = glob($poFileDir ."/*.po");
+ if ( is_array($poFiles) ){
+ foreach ( $poFiles as $poFile ) {
+ // extract path and extension of file name.
+ $founded []= substr($poFile,$start,-3);
+ }
+ }
+
+
$this->translations[$domain]= $founded;
// set defaultDomain
if ( $this->defaultDomain === false ) {
$this->defaultDomain = $domain;
}
-
-
+
return ($this->translateTo=='en' || isset($this->domains[$domain]) );
}
=== modified file 'assets/apps/upgrader/TranslateUsingPo.php'
--- assets/apps/upgrader/TranslateUsingPo.php 2012-02-01 22:40:03 +0000
+++ assets/apps/upgrader/TranslateUsingPo.php 2012-03-15 19:52:07 +0000
@@ -122,18 +122,22 @@
// search all availabled languages
$founded = array();
$start = strlen($poFileDir)+1;
- foreach ( glob($poFileDir ."/*.po") as $poFile ) {
- // extract path and extension of file name.
- $founded []= substr($poFile,$start,-3);
- }
+ $poFiles = glob($poFileDir ."/*.po");
+ if ( is_array($poFiles) ){
+ foreach ( $poFiles as $poFile ) {
+ // extract path and extension of file name.
+ $founded []= substr($poFile,$start,-3);
+ }
+ }
+
+
$this->translations[$domain]= $founded;
// set defaultDomain
if ( $this->defaultDomain === false ) {
$this->defaultDomain = $domain;
}
-
-
+
return ($this->translateTo=='en' || isset($this->domains[$domain]) );
}
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
