Permalink
Browse files

Merge branch 'master' of git@github.com:gallery/gallery3

  • Loading branch information...
2 parents d6695e8 + 5e57346 commit 38233c67a2946d6fe7b6457217541c796247285d @bharat bharat committed Nov 21, 2009
@@ -125,7 +125,7 @@ private function process_css($css_file) {
if (preg_match_all($PATTERN, $css, $matches, PREG_SET_ORDER)) {
$search = $replace = array();
foreach ($matches as $match) {
- $relative = substr(realpath(dirname($css_file) . "/$match[1]"), $docroot_length);
+ $relative = dirname($css_file) . "/$match[1]";
if (!empty($relative)) {
$search[] = $match[0];
$replace[] = "url('" . url::abs_file($relative) . "')";
@@ -23,7 +23,7 @@
fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4",
fileDesc: <?= t("Photos and movies")->for_js() ?>,
cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>",
- buttonText: <?= t("Select Photos ...")->for_js() ?>,
+ buttonText: <?= t("Select photos...")->for_js() ?>,
simUploadLimit: 10,
wmode: "transparent",
hideButton: true, /* should be true */
@@ -114,7 +114,7 @@
</div>
<div id="g-add-photos-canvas" style="text-align: center;">
- <a id="g-add-photos-button" class="ui-corner-all" style="padding-bottom: 1em;" href="#"><?= t("Select Photos...") ?></a>
+ <a id="g-add-photos-button" class="ui-corner-all" style="padding-bottom: 1em;" href="#"><?= t("Select photos...") ?></a>
<span id="g-uploadify"></span>
</div>
<div id="g-add-photos-status" style="text-align: center;">
@@ -340,7 +340,7 @@ static function _get_user_add_form_admin() {
->rules($minimum_length ? "required|length[$minimum_length, 40]" : "length[40]");
module::event("user_add_form_admin", $user, $form);
- $group->submit("")->value(t("Add User"));
+ $group->submit("")->value(t("Add user"));
return $form;
}

0 comments on commit 38233c6

Please sign in to comment.