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

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 8a7c9951..1b6b875d 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -56,7 +56,7 @@ class album_Core {
     $album->thumb_dirty = 1;
     $album->resize_dirty = 1;
     $album->rand_key = ((float)mt_rand()) / (float)mt_getrandmax();
-    $album->sort_column = "weight";
+    $album->sort_column = "created";
     $album->sort_order = "ASC";
 
     while (ORM::factory("item")
@@ -116,11 +116,11 @@ class album_Core {
 
     $sort_order->dropdown("column", array("id" => "gAlbumSortColumn"))
       ->label(t("Sort by"))
-      ->options(array("weight" => t("Order Added"),
-                      "captured" => t("Capture Date"),
-                      "created" => t("Creation Date"),
+      ->options(array("weight" => t("Manual"),
+                      "captured" => t("Date captured"),
+                      "created" => t("Date uploaded"),
                       "title" => t("Title"),
-                      "updated" => t("Updated Date"),
+                      "updated" => t("Date modified"),
                       "view_count" => t("Number of views"),
                       "rand_key" => t("Random")))
       ->selected($parent->sort_column);