From e1fca2a1abd24d3509fc017b21f0631b30d74bc5 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Tue, 6 Oct 2015 06:45:55 -0400 Subject: Add message about exporting by year/month to uexport --- mod/uexport.php | 11 +++++++++-- view/tpl/uexport.tpl | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/mod/uexport.php b/mod/uexport.php index fbbe9953b..7dbe40d51 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -44,9 +44,16 @@ function uexport_content(&$a) { $o = replace_macros(get_markup_template('uexport.tpl'), array( '$title' => t('Export Channel'), '$basictitle' => t('Export Channel'), - '$basic' => t('Export your basic channel information to a small file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new hub, but does not contain your content.'), + '$basic' => t('Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content.'), '$fulltitle' => t('Export Content'), - '$full' => t('Export your channel information and all the content to a JSON backup. This backs up all of your connections, permissions, profile data and all of your content, but is generally not suitable for importing a channel to a new hub as this file may be VERY large. Please be patient - it may take several minutes for this download to begin.') + '$full' => t('Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large. Please be patient - it may take several minutes for this download to begin.'), + '$by_year' => t('Export your posts from a given year.'), + + '$extra' => t('You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range.'), + '$extra2' => sprintf( t('To select all posts for a given year, such as this year, visit %2$s'),$yearurl,$yearurl), + '$extra3' => sprintf( t('To select all posts for a given month, such as January of this year, visit %2$s'),$janurl,$janurl), + '$extra4' => sprintf( t('These content files may be imported or restored by visiting %2$s on any site containing your channel. For best results please import or restore these in date order (oldest first).'),$impurl,$impurl) + )); return $o; } diff --git a/view/tpl/uexport.tpl b/view/tpl/uexport.tpl index b9a1b9572..7eafd97a6 100644 --- a/view/tpl/uexport.tpl +++ b/view/tpl/uexport.tpl @@ -8,5 +8,12 @@

{{$fulltitle}}

{{$full}}

+ +

{{$extra}}

+

{{$extra2}}

+

{{$extra3}}

+ +

{{$extra4}}

+ -- cgit v1.2.3 From 8bf45536d307c11980d11c53edeef997b6d70954 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Tue, 6 Oct 2015 06:50:33 -0400 Subject: Forgot the year and month url part --- mod/uexport.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mod/uexport.php b/mod/uexport.php index 7dbe40d51..4e781fee1 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -41,6 +41,12 @@ function uexport_init(&$a) { } function uexport_content(&$a) { + + $y = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); + + $yearurl = z_root() . '/uexport/' . $y; + $janurl = z_root() . '/uexport/' . $y . '/1'; + $impurl = '/import_items'; $o = replace_macros(get_markup_template('uexport.tpl'), array( '$title' => t('Export Channel'), '$basictitle' => t('Export Channel'), -- cgit v1.2.3 From 9034765790013931a447f8b7ac49c67683c213e7 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Wed, 7 Oct 2015 20:37:00 -0400 Subject: There is no mod/import_items tool in RedMatrix --- mod/uexport.php | 3 +-- view/tpl/uexport.tpl | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/mod/uexport.php b/mod/uexport.php index 4e781fee1..c302b36d6 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -57,8 +57,7 @@ function uexport_content(&$a) { '$extra' => t('You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range.'), '$extra2' => sprintf( t('To select all posts for a given year, such as this year, visit %2$s'),$yearurl,$yearurl), - '$extra3' => sprintf( t('To select all posts for a given month, such as January of this year, visit %2$s'),$janurl,$janurl), - '$extra4' => sprintf( t('These content files may be imported or restored by visiting %2$s on any site containing your channel. For best results please import or restore these in date order (oldest first).'),$impurl,$impurl) + '$extra3' => sprintf( t('To select all posts for a given month, such as January of this year, visit %2$s'),$janurl,$janurl) )); return $o; diff --git a/view/tpl/uexport.tpl b/view/tpl/uexport.tpl index 7eafd97a6..3b08c1853 100644 --- a/view/tpl/uexport.tpl +++ b/view/tpl/uexport.tpl @@ -13,7 +13,5 @@

{{$extra2}}

{{$extra3}}

-

{{$extra4}}

- -- cgit v1.2.3 From a9696abdcec317140c30d0138be907812bdb83c2 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Fri, 9 Oct 2015 16:45:29 +0200 Subject: Redesigned the export page. Please fix my English if I made some mistakes. --- mod/uexport.php | 17 ++++++++++------- view/tpl/uexport.tpl | 13 +++++++++---- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/mod/uexport.php b/mod/uexport.php index c302b36d6..06b9d90ea 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -43,21 +43,24 @@ function uexport_init(&$a) { function uexport_content(&$a) { $y = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); + $ly = $y-1; - $yearurl = z_root() . '/uexport/' . $y; - $janurl = z_root() . '/uexport/' . $y . '/1'; - $impurl = '/import_items'; + $expurl = z_root() . '/uexport'; $o = replace_macros(get_markup_template('uexport.tpl'), array( '$title' => t('Export Channel'), '$basictitle' => t('Export Channel'), '$basic' => t('Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content.'), '$fulltitle' => t('Export Content'), '$full' => t('Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large. Please be patient - it may take several minutes for this download to begin.'), - '$by_year' => t('Export your posts from a given year.'), + '$by_year' => t('Export your posts from a given year or month:'), - '$extra' => t('You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range.'), - '$extra2' => sprintf( t('To select all posts for a given year, such as this year, visit %2$s'),$yearurl,$yearurl), - '$extra3' => sprintf( t('To select all posts for a given month, such as January of this year, visit %2$s'),$janurl,$janurl) + '$extra' => t('You may also export your posts and conversations for a particular year or month. Click on one of the recent years or months below.'), + '$extra2' => sprintf( '%2$s: ' . t('Jan') . ' ' . t('Feb') . ' ' . t('Mar') . ' ' . t('Apr') . ' ' . t('May') . ' ' . t('Jun') . ' ' . t('Jul') . ' ' . t('Aug') . ' ' . t('Sep') . ' ' . t('Oct') . ' ' . t('Nov') . ' ' . t('Dec') . '',$expurl,$ly), + '$extra3' => sprintf( '%2$s: ' . t('Jan') . ' ' . t('Feb') . ' ' . t('Mar') . ' ' . t('Apr') . ' ' . t('May') . ' ' . t('Jun') . ' ' . t('Jul') . ' ' . t('Aug') . ' ' . t('Sep') . ' ' . t('Oct') . ' ' . t('Nov') . ' ' . t('Dec') . '',$expurl,$y), + '$extra4' => t('If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range.'), + '$extra5' => sprintf( t('Or adjust the date in your browser location bar to select other dates. For example the year 2013; %1$s/2013 or the month September 2013; %1$s/2013/9'),$expurl), + '$extra6' => t('Please visit') . ' https://hub.tld/import_items ' . t('on another hub to import the backup files(s).'), + '$extra7' => t('We advise you to clone the channel on the new hub first and than to import the backup file(s) (from the same channel) in chronological order. Importing the backup files into another channel will certainly give permission issues.') )); return $o; diff --git a/view/tpl/uexport.tpl b/view/tpl/uexport.tpl index 3b08c1853..8fea26404 100644 --- a/view/tpl/uexport.tpl +++ b/view/tpl/uexport.tpl @@ -8,10 +8,15 @@

{{$fulltitle}}

{{$full}}

- -

{{$extra}}

-

{{$extra2}}

-

{{$extra3}}

+

{{$by_year}}

+

{{$extra}}


+
    +
  • {{$extra2}}

    • +
  • {{$extra3}}

    • +
+

{{$extra4}}

+

{{$extra5}}

+

{{$extra6}} {{$extra7}}

-- cgit v1.2.3 From b31aa4aacbef58cabd13a94f466180c63cfe328f Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 9 Oct 2015 14:25:29 -0700 Subject: string update --- util/messages.po | 4 ++-- version.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/util/messages.po b/util/messages.po index 07c6e08fa..947acab5b 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-10-02.1173\n" +"Project-Id-Version: 2015-10-09.1180\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-02 00:04-0700\n" +"POT-Creation-Date: 2015-10-09 00:04-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/version.inc b/version.inc index caa48ad45..6eff764e2 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-10-06.1177 +2015-10-09.1180 -- cgit v1.2.3