Am 04.05.21 um 21:57 schrieb Marcus:
Am 04.05.21 um 21:49 schrieb Dave Fisher:
We would likely split the announce off from the brand.
type=brand
home=home
search=buscar
selectedlang=ast
language=Llingua
name=Apache OpenOffice
tagline=La suite de productividá abierta y llibre
logo=AOO_logos/AOO4_website_logo.png
domain=https://www.openoffice.org
divid=bannera
~~~~~~
type=annouce
announce=Espublizada Apache OpenOffice 4.1.10
announceurl=https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.10+Release+Notes
announcetip=Espublizada Apache OpenOffice 4.1.10
~~~~~~
announce.gsp:
<div id="announce"><a href="${content.announceurl}"
title="${content.announcetip}">${content.announce}</a></div>
In page.gsp:
Follow <!--#include virtual="${content.brand}" -->
With: <!--#include virtual="${content.annouce}" —>
And in ssi_paths.gsp you would add announce support following the
pattern.
thanks for this inside. Thats a good first step.
Is there also a possibility to separate the values for the "announce
url" and release number in "announce" and "announce tip"?
They need to come from the general brand.md.
I've deleted the version number from the brand.md files and added it
into the brand.gsp. Not the best solution as it is hard-coded but it's
working (as you can see on any webpage in the stanging area). And it's
now only 1 place that needs to be changed for a new release.
Do you know a way how to define some global variables that can be used
in brand.gsp but also can be overwritten from localized brand.md files?
I tried a bit with a new variable in ssi_paths.gsp but only "null" is
displayed on the webpage.
Thanks
Marcus
On May 4, 2021, at 12:37 PM, Marcus <[email protected]> wrote:
Am 04.05.21 um 19:47 schrieb Dave Fisher:
+1 !
great that you like this change. :-)
It could be better but I don't know how and if it is possible.
There are some languages that have translated link texts but refer to
the English release notes. Example for .../ast/brand.md:
type=brand
home=home
search=buscar
selectedlang=ast
language=Llingua
name=Apache OpenOffice
tagline=La suite de productividá abierta y llibre
logo=AOO_logos/AOO4_website_logo.png
domain=https://www.openoffice.org
divid=bannera
announce=Espublizada Apache OpenOffice 4.1.10
announceurl=https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.10+Release+Notes
announcetip=Espublizada Apache OpenOffice 4.1.10
~~~~~~
I would like to separate the translated text with the release data
and combine both again in the build process. Example:
type=brand
home=home
search=buscar
selectedlang=ast
language=Llingua
name=Apache OpenOffice
tagline=La suite de productividá abierta y llibre
logo=AOO_logos/AOO4_website_logo.png
domain=https://www.openoffice.org
divid=bannera
announce=Espublizada Apache OpenOffice ${release number}
announceurl=<value from the general brand.md, overwritten only when
customized value is existing>
announcetip=Espublizada Apache OpenOffice ${release number}
Is it possible to take the release number fom a separate file and
include it here as variable?
Can the value for "announceurl" come from the general brand.md file
and only overwritten when a customized one is existing in the
localized brand.md?
However, I've not the knowledge to do this.
Do you have an idea how to do?
Thanks
Marcus
On May 4, 2021, at 10:37 AM, [email protected] wrote:
This is an automated email from the ASF dual-hosted git repository.
marcus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
The following commit(s) were added to refs/heads/main by this push:
new b870537 Reworked the entries for 'brand.html' to use the
general English text when no translation is available, to lower the
effort for updating the website for new releases
b870537 is described below
commit b870537b21d465b27d692e7cd7ebb67867349e8d
Author: Marcus <[email protected]>
AuthorDate: Tue May 4 19:37:04 2021 +0200
Reworked the entries for 'brand.html' to use the general
English text when no translation is available, to lower the effort
for updating the website for new releases
---
templates/ssi_paths.gsp | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/templates/ssi_paths.gsp b/templates/ssi_paths.gsp
index 819a499..9a2b2da 100644
--- a/templates/ssi_paths.gsp
+++ b/templates/ssi_paths.gsp
@@ -5,12 +5,19 @@
content.leftnav=null;
content.rightnav=null;
+// As long as we have no translation for a specific language, we
will use the general English text to keep the website updates as
low as possible for new releases.
+// Therefore some of the following languages are commented out and
in the next line the general "brand.html" will be used.
+
def brand = [:]
brand["/"] = "/brand.html"
- brand["/af/"] = "/af/brand.html"
- brand["/am/"] = "/am/brand.html"
- brand["/ar/"] = "/ar/brand.html"
- brand["/ast/"] = "/ast/brand.html"
+// brand["/af/"] = "/af/brand.html"
+ brand["/af/"] = "/brand.html"
+// brand["/am/"] = "/am/brand.html"
+ brand["/am/"] = "/brand.html"
+// brand["/ar/"] = "/ar/brand.html"
+ brand["/ar/"] = "/brand.html"
+// brand["/ast/"] = "/ast/brand.html"
+ brand["/ast/"] = "/brand.html"
brand["/bg/"] = "/bg/brand.html"
brand["/ca/"] = "/ca/brand.html"
brand["/cs/"] = "/cs/brand.html"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
