[LON-CAPA-cvs] cvs: loncom /localize lonlocal.pm /localize/localize newphrases.txt

www lon-capa-cvs@mail.lon-capa.org
Mon, 29 Sep 2003 13:24:49 -0000 

This is a MIME encoded message

--www1064841889
Content-Type: text/plain

www		Mon Sep 29 09:24:49 2003 EDT

  Modified files:              
    /loncom/localize	lonlocal.pm 
    /loncom/localize/localize	newphrases.txt 
  Log:
  Looks like setlocale is causing all sorts of trouble, probably broken.
  
  
--www1064841889
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20030929092449.txt"

Index: loncom/localize/lonlocal.pm
diff -u loncom/localize/lonlocal.pm:1.15 loncom/localize/lonlocal.pm:1.16
--- loncom/localize/lonlocal.pm:1.15	Sat Sep 27 23:02:36 2003
+++ loncom/localize/lonlocal.pm	Mon Sep 29 09:24:49 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.15 2003/09/28 03:02:36 www Exp $
+# $Id: lonlocal.pm,v 1.16 2003/09/29 13:24:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -277,7 +277,7 @@
     if (&Apache::lonnet::mod_perl_version == 1) {
 	$r->content_languages([&current_language()]);
     }
-    setlocale(LC_ALL,&current_locale);
+###    setlocale(LC_ALL,&current_locale);
 }
 
 1;
Index: loncom/localize/localize/newphrases.txt
diff -u loncom/localize/localize/newphrases.txt:1.4 loncom/localize/localize/newphrases.txt:1.5
--- loncom/localize/localize/newphrases.txt:1.4	Sat Sep 27 20:14:25 2003
+++ loncom/localize/localize/newphrases.txt	Mon Sep 29 09:24:49 2003
@@ -2,6 +2,579 @@
 Error Messages
 Update Display
 All versions
+<<<<<<< newphrases.txt
+userauthentication.gif
+Load
+Domain
+User Load
+Server
+Log in
+percent
+Server Administration
+Help
+System Administration
+aboutlon.gif
+accessbutton.gif
+Password
+Username
+Unsuccessful Login
+
+userauthentication.gif
+Load
+Domain
+User Load
+Server
+Log in
+percent
+Server Administration
+Help
+System Administration
+aboutlon.gif
+accessbutton.gif
+Password
+Username
+Successful Login
+No Role, Cumulative Privileges
+Launch Remote Control
+Main Menu
+Navigate Contents
+Return to Last Location
+User Roles
+No Role, Cumulative Privileges
+Main Menu
+Launch Remote Control
+Navigate Contents
+Return to Last Location
+Your home server is 
+Author and Co-Author roles may not be available on servers other than your home server.
+Show all roles
+Display
+User Role
+Extent
+Start
+End
+Remark
+Author
+Construction Space
+Domain
+Server
+Select
+Co-Author
+Construction Space
+User
+Domain
+Server
+Switch Server
+Course Coordinator
+Course
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Syllabus
+Domain
+Select
+Instructor
+Course
+Currently not available
+Syllabus
+Domain
+Select
+Instructor
+Course
+Section/Group
+Currently not available
+Syllabus
+Domain
+Select
+Student
+Course
+Syllabus
+Select
+Currently selected. 
+No role specified
+Entering course ...
+not displayed
+not displayed
+not displayed
+not displayed
+Creation Date
+Notes
+Custom Distribution File
+Keyword(s)
+MIME Type
+Abstract
+Copyright/Distribution
+Publisher/Owner
+Author(s)
+Subject
+Language
+Catalog Information
+
+Switching Role
+Course Coordinator
+Main Menu
+Launch Remote Control
+Navigate Contents
+Return to Last Location
+URLs To Include in Syllabus
+Web Links
+Readings
+Project Information
+Exam Information
+Deadlines
+Course Description
+Instructor Information
+Class Hours
+Prerequisites
+Office Hours
+Coursepack
+Grading Information
+Helproom Hours
+Textbook
+Syllabus
+Course Coordinator
+Main Menu
+Launch Remote Control
+Navigate Contents
+Return to Last Location
+not displayed
+not displayed
+not displayed
+not displayed
+Creation Date
+Notes
+Custom Distribution File
+Keyword(s)
+MIME Type
+Abstract
+Copyright/Distribution
+Publisher/Owner
+Author(s)
+Subject
+Language
+Catalog Information
+
+backward
+
+Go to the previous resource in the course sequence
+forward
+
+Go to the next resource in the course sequence
+prepare
+printout
+Prepare a printable document
+set
+bookmark
+Set a bookmark for this resource
+anno-
+tations
+Make notes and annotations about this resource
+Course Coordinator
+Course Coordinator
+Instructor
+Course Coordinator
+Course Coordinator
+Instructor
+Instructor
+Instructor
+Instructor
+Instructor
+Instructor
+Course Coordinator
+Instructor
+Course Coordinator
+Course Coordinator
+Instructor
+Instructor
+Instructor
+Instructor
+Instructor
+Instructor
+Course Coordinator
+Instructor
+Course Coordinator
+Instructor
+This syllabus can be publicly viewed at
+Uploaded
+Main Menu
+Course Coordinator
+Main Menu
+Launch Remote Control
+Navigate Contents
+Return to Last Location
+switch
+role
+Switch to another user role
+course
+docs
+View documents included in this course
+edit crs
+docs
+Edit and view documents included in this course
+navigate
+contents
+Navigate the table of contents for this course
+my
+grades
+Show Problem Completeness
+course
+grades
+Calculate course grades (Spreadsheet)
+course
+chart
+View the course assessment progress chart
+course
+stats
+View course assessment statistics
+course
+enroll
+Drop/Add students in this course
+user
+roles
+Create a user or modify the roles and privileges of a user
+course
+parms
+Set deadlines and other assessment parameters, as well as modify course environment
+resource
+space
+Browse published resources
+view
+bookmark
+Use or edit my bookmark collection
+calendar
+announce
+Course announcements and my calendar
+commu-
+nication
+Send and receive messages
+course
+chat
+Enter the chatroom for the course
+search
+course
+Search the contents of this course
+search
+library
+Search the database of published resources
+prefer-
+ences
+Set my user preferences
+exit
+
+Exit LON-CAPA
+User Roles
+Course Coordinator
+Main Menu
+Launch Remote Control
+Navigate Contents
+Return to Last Location
+Your home server is 
+Author and Co-Author roles may not be available on servers other than your home server.
+Show all roles
+Display
+User Role
+Extent
+Start
+End
+Remark
+Author
+Construction Space
+Domain
+Server
+Select
+Co-Author
+Construction Space
+User
+Domain
+Server
+Switch Server
+Currently selected. 
+Course Coordinator
+Course
+Currently not available
+Syllabus
+Domain
+Re-Initialize
+Course Coordinator
+Course
+Currently not available
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Currently not available
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Currently not available
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Currently not available
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Currently not available
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Currently not available
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Currently not available
+Syllabus
+Domain
+Select
+Course Coordinator
+Course
+Currently not available
+Syllabus
+Domain
+Select
+Instructor
+Course
+Currently not available
+Syllabus
+Domain
+Select
+Instructor
+Course
+Section/Group
+Currently not available
+Syllabus
+Domain
+Select
+Student
+Course
+Entering course ...
+not displayed
+not displayed
+not displayed
+not displayed
+Creation Date
+Notes
+Custom Distribution File
+Keyword(s)
+MIME Type
+Abstract
+Copyright/Distribution
+Publisher/Owner
+Author(s)
+Subject
+Language
+Catalog Information
+
+Switching Role
+Course Coordinator
+Launch Remote Control
+Main Menu
+Navigate Contents
+Return to Last Location
+URLs To Include in Syllabus
+Web Links
+Readings
+Project Information
+Exam Information
+Deadlines
+Course Description
+Instructor Information
+Class Hours
+Office Hours
+Prerequisites
+Coursepack
+Grading Information
+Helproom Hours
+Textbook
+Syllabus
+Course Coordinator
+Main Menu
+Launch Remote Control
+Navigate Contents
+Return to Last Location
+backward
+
+Go to the previous resource in the course sequence
+forward
+
+Go to the next resource in the course sequence
+prepare
+printout
+Prepare a printable document
+set
+bookmark
+Set a bookmark for this resource
+anno-
+tations
+Make notes and annotations about this resource
+Course Coordinator
+Course Coordinator
+Instructor
+Course Coordinator
+Course Coordinator
+Instructor
+Instructor
+Instructor
+Instructor
+Instructor
+Instructor
+Course Coordinator
+Instructor
+Course Coordinator
+Course Coordinator
+Instructor
+Instructor
+Instructor
+Instructor
+Instructor
+Instructor
+Course Coordinator
+Instructor
+Course Coordinator
+Instructor
+This syllabus can be publicly viewed at
+Uploaded
+Navigate Course Contents
+Navigate Course Contents
+Course Coordinator
+Main Menu
+Launch Remote Control
+Navigate Contents
+Return to Last Location
+not displayed
+not displayed
+not displayed
+not displayed
+MIME Type
+Abstract
+Subject
+Creation Date
+Notes
+Custom Distribution File
+Keyword(s)
+Copyright/Distribution
+Publisher/Owner
+Author(s)
+Language
+Catalog Information
+
+Go To My First Homework Problem
+Show Only Uncompleted Homework
+Open All Folders
+Answer available
+Navigate Course Contents
+Navigate Course Contents
+Course Coordinator
+Main Menu
+Launch Remote Control
+Navigate Contents
+Return to Last Location
+Go To My First Homework Problem
+Show Only Uncompleted Homework
+Open All Folders
+Answer available
+Answer available
+Due
+Due
+Answer available
+Answer available
+Answer available
+Answer available
+Answer available
+Answer available
+Answer available
+Answer available
+Answer available
+Answer available
+Answer available
+Answer available
+Main Menu
+Launch Remote Control
+Navigate Contents
+Return to Last Location
+view sub-
+missions
+View user submissions for this assessment resource
+problem
+grades
+Modify user grades for this assessment resource
+problem
+parms
+Modify deadlines, etc, for this assessment resource
+backward
+
+Go to the previous resource in the course sequence
+forward
+
+Go to the next resource in the course sequence
+prepare
+printout
+Prepare a printable document
+set
+bookmark
+Set a bookmark for this resource
+anno-
+tations
+Make notes and annotations about this resource
+catalog
+info
+Show catalog information
+evaluate
+this
+Provide my evaluation of this resource
+feedback
+discuss
+Provide feedback messages or contribute to the course discussion about this resource
+Tries
+=======
 Since Start of Course
 Content changed
 Version
@@ -16,3 +589,8 @@
 not found
 access denied
 warning(s)
+>>>>>>> 1.4
+Currently not available
+Select
+Select
+No role specified

--www1064841889--