Skip to content

Commit

Permalink
Item13897: Merge remote-tracking branch 'origin/master' into Item13897
Browse files Browse the repository at this point in the history
  • Loading branch information
@vrurg
vrurg committed Dec 23, 2015
2 parents 5f51907 + 79e1666 commit d81582b
Show file tree
Hide file tree
Showing 26 changed files with 862 additions and 760 deletions.
3 changes: 2 additions & 1 deletion core/lib/Foswiki/LoginManager.pm
View file
Expand Up @@ -655,7 +655,8 @@ sub redirectToLoggedOutUrl {

# ForceDefaultUrlHost enabled - probably a reverse proxy.
$path_info ||= '';
$redirectUrl = $session->{urlHost} . $path_info;
my $action = $session->{request}->{action} || 'view';
$redirectUrl = $session->getScriptUrl( '1', $action ) . $path_info;
}
elsif ($path_info) {
$redirectUrl = $session->{request}->url() . $path_info;
Expand Down
64 changes: 34 additions & 30 deletions core/locale/Foswiki.pot
View file
Expand Up @@ -1085,7 +1085,7 @@ msgstr ""
msgid "Checked topics will be updated to point to the new web name."
msgstr ""

#: core/templates/more.tmpl:204
#: core/templates/more.tmpl:205
msgid "Child topics in %1 web"
msgstr ""

Expand Down Expand Up @@ -1155,7 +1155,7 @@ msgstr ""
msgid "Commenting is disabled while running from the command line"
msgstr ""

#: HistoryPlugin/templates/oopshistory.tmpl:101 core/templates/more.tmpl:149
#: HistoryPlugin/templates/oopshistory.tmpl:101 core/templates/more.tmpl:150
msgid "Compare revisions"
msgstr ""

Expand Down Expand Up @@ -1257,6 +1257,10 @@ msgstr ""
msgid "Country:"
msgstr ""

#: core/data/System/FrequentlyAskedQuestions.txt:45
msgid "Create New FAQ Topic"
msgstr ""

#: PatternSkin/data/Main/WebLeftBarExample.txt:7
#: PatternSkin/data/Sandbox/WebLeftBarExample.txt:6
#: PatternSkin/data/_default/WebLeftBar.txt:5
Expand Down Expand Up @@ -1289,10 +1293,6 @@ msgstr ""
msgid "Create group"
msgstr ""

#: core/data/System/FrequentlyAskedQuestions.txt:45
msgid "Create new FAQ topic"
msgstr ""

#: FamFamFamContrib/templates/view.famfamfam.tmpl:30
#: FamFamFamContrib/templates/view.famfamfam.tmpl:31
msgid "Create new topic"
Expand Down Expand Up @@ -1352,7 +1352,7 @@ msgstr ""
msgid "Dear %1"
msgstr ""

#: HistoryPlugin/templates/oopshistory.tmpl:75 core/templates/more.tmpl:158
#: HistoryPlugin/templates/oopshistory.tmpl:75 core/templates/more.tmpl:159
msgid "Debug"
msgstr ""

Expand Down Expand Up @@ -1606,6 +1606,10 @@ msgstr ""
msgid "Enlarge edit box"
msgstr ""

#: core/templates/more.tmpl:102
msgid "Enter __none__ to clear the topic parent"
msgstr ""

#: core/templates/login.tmpl:7
msgid "Enter a new username and password to change identity"
msgstr ""
Expand Down Expand Up @@ -1721,7 +1725,7 @@ msgstr ""
msgid "Find similar topics"
msgstr ""

#: core/templates/more.tmpl:205
#: core/templates/more.tmpl:206
msgid "Find topics that are children of %1 ..."
msgstr ""

Expand Down Expand Up @@ -2190,7 +2194,7 @@ msgid "Incorrect parameters to the =%1= script"
msgstr ""

#: core/templates/registermessages.tmpl:127
msgid "Incorrect templatetopic name provided."
msgid "Incorrect topic name provided for the templatetopic parameter."
msgstr ""

#: NatEditPlugin/templates/edittoolbar.natedit.tmpl:74
Expand Down Expand Up @@ -2376,7 +2380,7 @@ msgstr ""
msgid "Last name:"
msgstr ""

#: core/templates/more.tmpl:179
#: core/templates/more.tmpl:180
msgid "Latest revision: %1"
msgstr ""

Expand Down Expand Up @@ -2655,7 +2659,7 @@ msgstr ""
msgid "New web name:"
msgstr ""

#: core/templates/more.tmpl:155
#: core/templates/more.tmpl:156
msgid "Newer revision:"
msgstr ""

Expand Down Expand Up @@ -2701,7 +2705,7 @@ msgstr ""
msgid "No permission to view %1"
msgstr ""

#: core/templates/more.tmpl:197
#: core/templates/more.tmpl:198
msgid "No previous revision exists."
msgstr ""

Expand Down Expand Up @@ -2815,7 +2819,7 @@ msgstr ""
msgid "Ok"
msgstr ""

#: core/templates/more.tmpl:155
#: core/templates/more.tmpl:156
msgid "Older revision:"
msgstr ""

Expand Down Expand Up @@ -2877,7 +2881,7 @@ msgstr ""
msgid "Optionally enter a different topic name:"
msgstr ""

#: HistoryPlugin/templates/oopshistory.tmpl:75 core/templates/more.tmpl:158
#: HistoryPlugin/templates/oopshistory.tmpl:75 core/templates/more.tmpl:159
msgid "Options"
msgstr ""

Expand Down Expand Up @@ -3368,7 +3372,7 @@ msgid "Resetting and setting password is not available."
msgstr ""

#: NatEditPlugin/templates/edittoolbar.natedit.tmpl:142
#: core/templates/more.tmpl:186
#: core/templates/more.tmpl:187
msgid "Restore"
msgstr ""

Expand All @@ -3384,27 +3388,27 @@ msgstr ""
msgid "Restore and exit"
msgstr ""

#: core/templates/more.tmpl:167
#: core/templates/more.tmpl:168
msgid "Restore topic"
msgstr ""

#: core/templates/more.tmpl:183
#: core/templates/more.tmpl:184
msgid "Restore topic to revision:"
msgstr ""

#: core/templates/more.tmpl:186
#: core/templates/more.tmpl:187
msgid "Restore topic to this revision"
msgstr ""

#: core/templates/more.tmpl:172
#: core/templates/more.tmpl:173
msgid ""
"Restore will save an exact copy of your selected revision into a new "
"revision. Because each revision will be preserved in the topic history, you "
"can always revisit the revision you are replacing. Note that attachments "
"will be left unchanged."
msgstr ""

#: core/templates/more.tmpl:177
#: core/templates/more.tmpl:178
msgid "Restoring is disabled because this topic is at revision 1."
msgstr ""

Expand Down Expand Up @@ -3454,7 +3458,7 @@ msgstr ""
msgid "Revision history of %1"
msgstr ""

#: core/templates/more.tmpl:135
#: core/templates/more.tmpl:136
msgid "Revisions"
msgstr ""

Expand Down Expand Up @@ -3566,7 +3570,7 @@ msgstr ""
msgid "Search string"
msgstr ""

#: core/templates/more.tmpl:205
#: core/templates/more.tmpl:206
msgid "Search the %1 Web for all children of this topic."
msgstr ""

Expand Down Expand Up @@ -3676,15 +3680,15 @@ msgstr ""
msgid "Send mail"
msgstr ""

#: HistoryPlugin/templates/oopshistory.tmpl:75 core/templates/more.tmpl:158
#: HistoryPlugin/templates/oopshistory.tmpl:75 core/templates/more.tmpl:159
msgid "Sequential"
msgstr ""

#: core/lib/Foswiki/Form/Checkbox.pm:80
msgid "Set all"
msgstr ""

#: core/templates/more.tmpl:104
#: core/templates/more.tmpl:105
msgid "Set new parent"
msgstr ""

Expand Down Expand Up @@ -3713,7 +3717,7 @@ msgstr ""
msgid "Shrink edit box"
msgstr ""

#: HistoryPlugin/templates/oopshistory.tmpl:75 core/templates/more.tmpl:158
#: HistoryPlugin/templates/oopshistory.tmpl:75 core/templates/more.tmpl:159
msgid "Side by side"
msgstr ""

Expand Down Expand Up @@ -4820,7 +4824,7 @@ msgstr ""
msgid "View difference"
msgstr ""

#: core/templates/more.tmpl:161
#: core/templates/more.tmpl:162
msgid "View differences"
msgstr ""

Expand All @@ -4832,19 +4836,19 @@ msgstr ""
msgid "View later"
msgstr ""

#: core/templates/more.tmpl:136
#: core/templates/more.tmpl:137
msgid "View previous topic revision"
msgstr ""

#: core/templates/oopsleaseconflict.tmpl:28
msgid "View raw text without formatting"
msgstr ""

#: core/templates/more.tmpl:143
#: core/templates/more.tmpl:144
msgid "View revision"
msgstr ""

#: core/templates/more.tmpl:140
#: core/templates/more.tmpl:141
msgid "View revision:"
msgstr ""

Expand Down Expand Up @@ -5403,7 +5407,7 @@ msgstr ""
msgid "ignore case"
msgstr ""

#: core/templates/more.tmpl:140
#: core/templates/more.tmpl:141
msgid "in raw text format"
msgstr ""

Expand Down

0 comments on commit d81582b

Please sign in to comment.