[CalendarServer-changes] [13106] CalendarServer/branches/users/sagen/move2who-4

[source_changes at macosforge.org]

Revision: 13106
          http://trac.calendarserver.org//changeset/13106
Author:   sagen at apple.com
Date:     2014-04-01 15:04:45 -0700 (Tue, 01 Apr 2014)
Log Message:
-----------
Change i18n user name back, and fix rendering of unicode names on principal page

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml
    CalendarServer/branches/users/sagen/move2who-4/conf/auth/generate_test_accounts.py
    CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py

Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml	2014-04-01 22:04:32 UTC (rev 13105)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml	2014-04-01 22:04:45 UTC (rev 13106)
@@ -38,7 +38,7 @@
     <guid>860B3EE9-6D7C-4296-9639-E6B998074A78</guid>
     <short-name>i18nuser</short-name>
     <password>i18nuser</password>
-    <full-name>💣</full-name>
+    <full-name>まだ</full-name>
     <email>i18nuser at example.com</email>
 </record>
 <record type="user">

Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/generate_test_accounts.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/generate_test_accounts.py	2014-04-01 22:04:32 UTC (rev 13105)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/generate_test_accounts.py	2014-04-01 22:04:45 UTC (rev 13106)
@@ -42,7 +42,7 @@
 for uid, fullName, guid in (
     ("admin", "Super User", "0C8BDE62-E600-4696-83D3-8B5ECABDFD2E"),
     ("apprentice", "Apprentice Super User", "29B6C503-11DF-43EC-8CCA-40C7003149CE"),
-    ("i18nuser", u"\ud83d\udca3".encode("utf-8"), "860B3EE9-6D7C-4296-9639-E6B998074A78"),
+    ("i18nuser", u"\u307e\u3060".encode("utf-8"), "860B3EE9-6D7C-4296-9639-E6B998074A78"),
 ):
     out.write("""<record>
     <uid>{guid}</uid>

Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py	2014-04-01 22:04:32 UTC (rev 13105)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py	2014-04-01 22:04:45 UTC (rev 13106)
@@ -632,13 +632,13 @@
             emailAddresses = []
         return tag.fillSlots(
             directoryGUID=str(record.service.guid),
-            realm=str(record.service.realmName),
+            realm=record.service.realmName.encode("utf-8"),
             principalGUID=guid,
             recordType=record.service.recordTypeToOldName(record.recordType),
-            shortNames=",".join(record.shortNames),
+            shortNames=",".join([n.encode("utf-8") for n in record.shortNames]),
             # MOVE2WHO: need this?
             # securityIDs=",".join(record.authIDs),
-            fullName=str(record.displayName),
+            fullName=record.displayName.encode("utf-8"),
             # MOVE2WHO: need this?
             # firstName=str(record.firstName),
             # MOVE2WHO: need this?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140401/0aff96d3/attachment.html>