Skip to content

Add Chinese (zh_CN/zh_TW) web UI, static doc home pages, and packaging#1535

Open
jackadam1981 wants to merge 1 commit intoOpenPrinting:masterfrom
jackadam1981:i18n-chinese
Open

Add Chinese (zh_CN/zh_TW) web UI, static doc home pages, and packaging#1535
jackadam1981 wants to merge 1 commit intoOpenPrinting:masterfrom
jackadam1981:i18n-chinese

Conversation

@jackadam1981
Copy link
Copy Markdown

Summary

Add Simplified Chinese (zh_CN) and Traditional Chinese (zh_TW) for the CUPS web interface: localized templates, static localized doc home pages, desktop entries, and packaging install rules.

Scope

  • Templates: templates/zh_CN/ and templates/zh_TW/ (localized UI strings).
  • Documentation: doc/zh_CN/ and doc/zh_TW/ static index.html (shared site CSS under $DOCDIR).
  • Desktop: desktop/cups.desktop.inName / Comment for zh_CN and zh_TW.
  • Packaging: packaging/cups.list.in and packaging/cups.spec.in — install the above paths; locale .po listing in cups.list.in stays aligned with upstream (no extra zh_CN line; zh_TW .po remains commented like upstream).

Upstream alignment

  • Build/install paths match upstream patterns: no doc/index.html.in / templates/header.tmpl.in in configure; doc/Makefile WEBPAGES matches upstream (no root doc/index.html install).
  • Restored upstream copies where unrelated to this feature: templates/header.tmpl, templates/printer-added.tmpl, locale/cups_zh_CN.po; removed locale/cups_zh_TW.po.
  • Makefile distclean includes upstream wildcard cleanup for doc/*/index.html and templates/*/header.tmpl (restore tracked locale files with git checkout after distclean if needed).

Testing

  • Manual: set browser / CUPS locale to zh_CN or zh_TW and exercise the web UI; confirm doc home pages and templates load.

- Add templates/zh_CN and templates/zh_TW for localized CUPS web interface
- Add doc/zh_CN and doc/zh_TW static index.html (shared $DOCDIR/cups.css)
- desktop/cups.desktop.in: zh_CN and zh_TW Name/Comment entries
- packaging/cups.list.in and cups.spec.in: install templates and localized doc trees;
Copy link
Copy Markdown
Member

@michaelrsweet michaelrsweet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is missing files for the new "home.tmpl" template, which replaced the index.html file last year... If you can address those missing files and address my other comments then I'll be happy to merge these changes in the master branch for CUPS 2.5.

Thanks!

Comment thread doc/zh_CN/index.html
@@ -0,0 +1,52 @@
<!DOCTYPE HTML>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is no longer used in the master branch.

Comment thread doc/zh_TW/index.html
@@ -0,0 +1,52 @@
<!DOCTYPE HTML>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is also no longer used in the master branch.

Comment thread packaging/cups.list.in

#d 0755 root sys $DOCDIR/zh_TW
#f 0444 root sys $DOCDIR/zh_TW doc/zh_TW/*.html
# zh_CN/zh_TW: static doc/index.html (like other locales); CSS is $DOCDIR/cups.css.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are no longer used (and I need to update the list file to reflect that...)

Comment thread packaging/cups.spec.in
/usr/share/doc/cups/pt_BR/*
%dir /usr/share/doc/cups/ru
/usr/share/doc/cups/ru/*
# zh_CN/zh_TW: localized static doc index.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise, there are no more language-specific files in this directory for CUPS 2.5.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants