Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
8571f155
Commit
8571f155
authored
Nov 16, 2017
by
Robert Lyon
Committed by
Gerrit Code Review
Nov 16, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Bug 1053308: export section - plural strings format fix"
parents
89ba6f07
d10b1993
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
25 additions
and
19 deletions
+25
-19
htdocs/artefact/blog/export/html/lib.php
htdocs/artefact/blog/export/html/lib.php
+1
-4
htdocs/artefact/blog/lang/en.utf8/artefact.blog.php
htdocs/artefact/blog/lang/en.utf8/artefact.blog.php
+4
-2
htdocs/artefact/plans/export/html/lib.php
htdocs/artefact/plans/export/html/lib.php
+5
-1
htdocs/artefact/plans/lang/en.utf8/artefact.plans.php
htdocs/artefact/plans/lang/en.utf8/artefact.plans.php
+4
-0
htdocs/export/html/lib.php
htdocs/export/html/lib.php
+2
-8
htdocs/lang/en.utf8/collection.php
htdocs/lang/en.utf8/collection.php
+4
-2
htdocs/lang/en.utf8/view.php
htdocs/lang/en.utf8/view.php
+4
-2
htdocs/theme/raw/plugintype/artefact/plans/export/html/templates/summary.tpl
...ugintype/artefact/plans/export/html/templates/summary.tpl
+1
-0
No files found.
htdocs/artefact/blog/export/html/lib.php
View file @
8571f155
...
...
@@ -47,10 +47,7 @@ class HtmlExportBlog extends HtmlExportArtefactPlugin {
}
if
(
$blogs
)
{
$smarty
->
assign
(
'blogs'
,
$blogs
);
$stryouhaveblogs
=
(
count
(
$blogs
)
==
1
)
?
get_string
(
'youhaveoneblog'
,
'artefact.blog'
)
:
get_string
(
'youhaveblogs'
,
'artefact.blog'
,
count
(
$blogs
));
$stryouhaveblogs
=
get_string
(
'youhavenblog'
,
'artefact.blog'
,
count
(
$blogs
),
count
(
$blogs
));
}
else
{
$stryouhaveblogs
=
get_string
(
'youhavenoblogs'
,
'artefact.blog'
);
...
...
htdocs/artefact/blog/lang/en.utf8/artefact.blog.php
View file @
8571f155
...
...
@@ -161,8 +161,10 @@ $string['youhavenoblogs'] = 'You have no journals.';
$string
[
'youhavenogroupblogs'
]
=
'There are no journals in this group.'
;
$string
[
'youhavenoinstitutionblogs'
]
=
'There are no journals in this institution.'
;
$string
[
'youhavenositeblogs'
]
=
'There are no site journals.'
;
$string
[
'youhaveoneblog'
]
=
'You have 1 journal.'
;
$string
[
'youhaveblogs'
]
=
'You have %s journals.'
;
$string
[
'youhavenblog'
]
=
array
(
'You have 1 journal.'
,
'You have %d journals.'
);
$string
[
'feedsnotavailable'
]
=
'Feeds are not available for this artefact type.'
;
$string
[
'feedrights'
]
=
'Copyright %s.'
;
...
...
htdocs/artefact/plans/export/html/lib.php
View file @
8571f155
...
...
@@ -44,8 +44,12 @@ class HtmlExportPlans extends HtmlExportArtefactPlugin {
}
$smarty
->
assign
(
'plans'
,
$plans
);
if
(
count
(
$plans
))
{
$smarty
->
assign
(
'stryouhaveplans'
,
get_string
(
'youhavenplan'
,
'artefact.plans'
,
count
(
$plans
),
count
(
$plans
)));
}
return
array
(
'title'
=>
get_string
(
'
p
lans'
,
'artefact.plans'
),
'title'
=>
get_string
(
'
P
lans'
,
'artefact.plans'
),
'description'
=>
$smarty
->
fetch
(
'export:html/plans:summary.tpl'
),
);
}
...
...
htdocs/artefact/plans/lang/en.utf8/artefact.plans.php
View file @
8571f155
...
...
@@ -39,6 +39,10 @@ $string['planstasksdescription'] = 'Add tasks below or use the "%s" button to be
$string
[
'saveplan'
]
=
'Save plan'
;
$string
[
'title'
]
=
'Title'
;
$string
[
'titledesc'
]
=
'The title will be used to display each task in the plans blocktype.'
;
$string
[
'youhavenplan'
]
=
array
(
'You have 1 plan.'
,
'You have %d plans.'
);
/* Tasks */
$string
[
'alltasks'
]
=
'All tasks'
;
...
...
htdocs/export/html/lib.php
View file @
8571f155
...
...
@@ -476,10 +476,7 @@ class PluginExportHtml extends PluginExport {
if
(
!
empty
(
$list
[
'views'
])
&&
(
$this
->
viewexportmode
==
self
::
EXPORT_ALL_VIEWS_COLLECTIONS
||
$this
->
viewexportmode
==
self
::
EXPORT_LIST_OF_VIEWS
))
{
$stryouhaveviews
=
(
$nviews
==
1
)
?
get_string
(
'youhaveoneview'
,
'view'
)
:
get_string
(
'youhaveviews'
,
'view'
,
$nviews
);
$smarty
->
assign
(
'stryouhaveviews'
,
$stryouhaveviews
);
$smarty
->
assign
(
'stryouhaveviews'
,
get_string
(
'youhavenviews'
,
'view'
,
$nviews
,
$nviews
));
$smarty
->
assign
(
'list'
,
$list
[
'views'
]);
$summary
[
'view'
]
=
array
(
'title'
=>
get_string
(
'Views'
,
'view'
),
...
...
@@ -493,10 +490,7 @@ class PluginExportHtml extends PluginExport {
if
(
!
empty
(
$list
[
'collections'
])
&&
(
$this
->
viewexportmode
==
self
::
EXPORT_ALL_VIEWS_COLLECTIONS
||
$this
->
viewexportmode
==
self
::
EXPORT_LIST_OF_COLLECTIONS
))
{
$stryouhavecollections
=
(
$ncollections
==
1
)
?
get_string
(
'youhaveonecollection'
,
'collection'
)
:
get_string
(
'youhavecollections'
,
'collection'
,
$ncollections
);
$smarty
->
assign
(
'stryouhavecollections'
,
$stryouhavecollections
);
$smarty
->
assign
(
'stryouhavecollections'
,
get_string
(
'youhavencollections'
,
'collection'
,
$ncollections
,
$ncollections
));
$smarty
->
assign
(
'list'
,
$list
[
'collections'
]);
$summary
[
'collection'
]
=
array
(
'title'
=>
get_string
(
'Collections'
,
'collection'
),
...
...
htdocs/lang/en.utf8/collection.php
View file @
8571f155
...
...
@@ -116,8 +116,10 @@ $string['copiedpagesblocksandartefactsfromtemplate'] = 'Copied %d pages, %d bloc
$string
[
'copiedblogpoststonewjournal'
]
=
'Copied journal posts have been put into a new separate journal.'
;
$string
[
'by'
]
=
'by'
;
$string
[
'copycollection'
]
=
'Copy collection'
;
$string
[
'youhaveonecollection'
]
=
'You have 1 collection.'
;
$string
[
'youhavecollections'
]
=
'You have %s collections.'
;
$string
[
'youhavencollections'
]
=
array
(
'You have 1 collection.'
,
'You have %d collections.'
,
);
$string
[
'youhavenocollections'
]
=
'You have no collections.'
;
$string
[
'collectionssharedtogroup'
]
=
'Collections shared with this group'
;
$string
[
'nosharedcollectionsyet'
]
=
'There are no collections shared with this group yet'
;
...
...
htdocs/lang/en.utf8/view.php
View file @
8571f155
...
...
@@ -101,8 +101,10 @@ $string['nviews'] = array(
);
$string
[
'youhavenoviews1'
]
=
'You don\'t have any pages or collections.'
;
$string
[
'youhaventcreatedanyviewsyet'
]
=
"You have not created any pages yet."
;
$string
[
'youhaveoneview'
]
=
'You have 1 page.'
;
$string
[
'youhaveviews'
]
=
'You have %s pages.'
;
$string
[
'youhavenviews'
]
=
array
(
'You have 1 page.'
,
'You have %d pages.'
,
);
$string
[
'viewsownedbygroup'
]
=
'Pages owned by this group'
;
$string
[
'nogroupviewsyet'
]
=
'There are no pages in this group yet'
;
$string
[
'viewssharedtogroup'
]
=
'Pages shared with this group'
;
...
...
htdocs/theme/raw/plugintype/artefact/plans/export/html/templates/summary.tpl
View file @
8571f155
<p>
{
$stryouhaveplans
}
</p>
{
if
$plans
}
<ul>
{
foreach
from
=
$plans
item
=
plan
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment