diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2011-04-22 16:54:55 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2011-04-22 16:54:55 +0000 |
| commit | 1f7c1f18c651c58048e92d615c71ac0fe6691c10 (patch) | |
| tree | 4527c4bc08000a07c180cd1fe81792d71195d58b /modules/gallery/views/upgrade_checker_block.html.php | |
| parent | de6f3fce9110b777d61dec97f2a3a61d887a5ccd (diff) | |
| parent | 55da59c942c0f7171b515f0718fea8506ed4b116 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/views/upgrade_checker_block.html.php')
| -rw-r--r-- | modules/gallery/views/upgrade_checker_block.html.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/gallery/views/upgrade_checker_block.html.php b/modules/gallery/views/upgrade_checker_block.html.php index b04887b2..c984d99f 100644 --- a/modules/gallery/views/upgrade_checker_block.html.php +++ b/modules/gallery/views/upgrade_checker_block.html.php @@ -6,8 +6,10 @@ <p> <? if (gallery::RELEASE_CHANNEL == "release"): ?> <?= t("You are using the official Gallery %version release, code named <i>%code_name</i>.", array("version" => gallery::VERSION, "code_name" => gallery::CODE_NAME)) ?> + <? elseif (isset($build_number)): ?> + <?= t("You are using an experimental snapshot of Gallery %version (build %build_number on branch %branch).", array("version" => gallery::VERSION, "branch" => gallery::RELEASE_BRANCH, "build_number" => $build_number)) ?> <? else: ?> - <?= t("You are using an experimental snapshot of Gallery %version (build %build_number on branch %branch).", array("version" => gallery::VERSION, "branch" => gallery::RELEASE_BRANCH, "build_number" => gallery::build_number())) ?> + <?= t("You are using an experimental snapshot of Gallery %version (branch %branch) but your gallery3/.build_number file is missing so we don't know what build you have. You should probably upgrade so that you have that file.", array("version" => gallery::VERSION, "branch" => gallery::RELEASE_BRANCH, "build_number" => $build_number)) ?> <? endif ?> </p> |